diff --git a/README.rst b/README.rst
index b2e06d2..19c1e24 100644
--- a/README.rst
+++ b/README.rst
@@ -43,6 +43,10 @@ to get results: natively in XML or JSON, PHP, Ruby and Python and then treatment
 Installation (Development Environment)
 ==========================================
 
+A detailed installation steps can be found in:
+
+`Detailed full environment installation <install.rst>`_
+
 Here we'll cover how to setup a development environment using a Vagrant 
 virtual machine.
 
@@ -64,7 +68,7 @@ First you will need to clone the repository:
 
 .. code-block::
 
-  git clone git@github.com:interlegis/colab.git
+  git clone git@github.com:colab-community/colab.git
 
 
 *NOTE:*
diff --git a/install.rst b/install.rst
new file mode 100644
index 0000000..b4cec20
--- /dev/null
+++ b/install.rst
@@ -0,0 +1,214 @@
+.. -*- coding: utf-8 -*-
+
+.. highlight:: rest
+
+.. _colab_software:
+
+=================================
+Installing a full colab environment
+=================================
+
+This file will guide you through the installation of colab's dependencys,
+external tools and its integration with colab to help you start using/working.
+
+The dependecys installation steps will be based of Ubuntu 13.04 but the tools,
+integrations and the colab itself runs in a virtual machine so it'll be the same regardless of your system.
+
+
+Fabric + VirtualBox + Vagrant
+==============
+
+You can easily install fabric using pip with
+
+.. code-block::
+
+  sudo apt-get install python-pip
+  sudo pip install fabric
+
+You can also instal Virtual Box with apt-get
+
+.. code-block::
+
+  sudo apt-get install virtualbox
+
+Now, vagrant has an apt-get but its not supported anymore, so you'll have to manually download and install it from the site
+
+  https://www.vagrantup.com/downloads.html
+
+Starting the VM and environment
+===============================
+
+Clone the repository to your system
+
+.. code-block::
+
+  git clone https://github.com/colab-community/colab.git
+  cd colab
+
+Create your local configuration file(we'll adjust it later)
+
+.. code-block::
+
+  cp src/colab/local_settings-dev.py src/colab/local_settings.py
+
+To startup the VM simple do
+
+.. code-block::
+
+  vagrant up
+
+*NOTE*
+
+  In case you have problems creating the virtual machine you might need to download the linux header files
+
+  .. code-block::
+
+    linux-headers-generic
+
+Accessing the VM and configurating the database
+===============================================
+
+You should now be able to access your VM through
+
+.. code-block::
+
+  vagrant ssh
+
+*NOTE*
+
+  In case you get a connection port refused or ssh error, you might need to activate manually an ssh server(rare)
+
+  .. code-block::
+
+    sudo apt-get install ssh; sudo service ssh start;
+
+The VM doesnt come with a databse so, you'll need to install one inside it.
+Inside de VM download and install postgresql
+
+.. code-block::
+
+  sudo apt-get install postgresql
+
+Access the postgresql database and create a new database and user colab user
+
+.. code-block::
+
+  sudo -u postgres psql
+    CREATE USER colab SUPERUSER INHERIT CREATEDB CREATEROLE;
+    ALTER USER colab PASSWORD 'colab';
+    CREATE DATABASE colab;
+
+Also, create the Trac's database(note it needs to support UTF8)
+
+.. code-block::
+
+  create database "trac_colab" with owner "colab" encoding 'UTF8' LC_COLLATE = 'en_US.UTF-8' LC_CTYPE = 'en_US.UTF-8' TEMPLATE=template0;
+  \q
+
+That's the database used for Trac, but its needed so colab can make its migrations correctly and adjust solr accordinly
+
+Installing Trac on the VM
+=========================
+
+Inside the VM(vagrant ssh) download e install trac
+
+.. code-block::
+
+  sudo apt-get install trac
+  sudo pip install --upgrade Trac
+
+Now you'll need to configure trac so it can access the previously created database. 
+
+.. code-block::
+
+  mkdir -p /var/local/trac
+  sudo trac-admin /var/local/trac initenv
+
+Set the project name to 'Colab' when asked, and the following postgresql connection string
+
+.. code-block::
+
+  postgres://colab:colab@/trac_colab?host=localhost
+
+The trac database should be populated with relations, now need to give trac write access to its folders
+
+.. code-block::
+
+  sudo chown -R www-data /var/local/trac
+  sudo chmod -R 775 /var/local/trac
+
+Finally, trac can be run by
+
+.. code-block::
+
+  tracd --port 5000 /var/local/trac
+
+Use port 8000 and access it on port 8080 in your local machine to see it works if you'd like(vagrant has port redirects)
+
+Setting up Colab
+=========================
+
+You can exit the vagrant VM ('exit' inside the ssh shell) but for now leave it running Trac and start a new terminal tab
+
+Open the /src/colab/local_settings.py file
+
+Change COLAB_TRAC_URL to
+
+.. code-block::
+
+  COLAB_TRAC_URL = 'http://localhost:5000/trac/'
+
+Or the port you're using to Trac
+
+Use fabric at colab's root to update the requirements to your VM
+
+.. code-block::
+
+  fabric runserver:update
+
+*NOTE:*
+
+  The fabric installation on ubuntu through 'pip install' might not be added to the path so you'll need to find
+  where it was installed if thats your case
+
+Now simply run fabric again to run the server (it'll also sync and migrate colab's database)
+
+.. code-block::
+
+  fabric runserver
+
+You should be able to see colab with its cms service already working at port 8000(because of vagrant redirects)
+
+*NOTE*
+
+  In case login doesn't work, change the SITE_URL in src/colab/local_settings.py the reflect the django's port
+  Also, add the following line riht bellow it
+    BROWSERID_AUDIENCES = [SITE_URL, SITE_URL.replace('https', 'http')]
+
+Installing Solr and indexing colab's schemas
+==========================================
+In Progress of making it readable
+  #http servlet jetty
+  sudo apt-get install jetty
+
+  #solr
+  wget http://ftp.unicamp.br/pub/apache/lucene/solr/4.6.1/solr-4.6.1.tgz
+  tar xvzf solr-4.6.1.tgz
+  sudo mv solr-4.6.1 /usr/share/solr
+
+  sudo cp /usr/share/solr/example/webapps/solr.war /usr/share/solr/example/solr/solr.war
+
+  python manage.py build_solr_schema >> schema.xml
+    #existe mais de uma referencia a stopwords_en
+    trocar no schema.xml stopwords_en.txt por lang/stopwords_en.txt
+
+  sudo cp schema.xml /usr/share/solr/example/solr/collection1/conf
+
+  #inclusive a tag
+  Remova <updateLog> em solrconfig.xml localizado em /usr/share/solr/example/solr/collection1/conf
+
+  #executa servidor
+  cd /usr/share/solr/example/; java -jar start.jar;
+
+  #indexa
+  python manage.py update_index
\ No newline at end of file
diff --git a/src/accounts/migrations/0001_initial.py b/src/accounts/migrations/0001_initial.py
new file mode 100644
index 0000000..bcb0ae7
--- /dev/null
+++ b/src/accounts/migrations/0001_initial.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'User'
+        db.create_table(u'accounts_user', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('password', self.gf('django.db.models.fields.CharField')(max_length=128)),
+            ('last_login', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
+            ('is_superuser', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('username', self.gf('django.db.models.fields.CharField')(unique=True, max_length=30)),
+            ('first_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
+            ('last_name', self.gf('django.db.models.fields.CharField')(max_length=30, blank=True)),
+            ('email', self.gf('django.db.models.fields.EmailField')(unique=True, max_length=75, blank=True)),
+            ('is_staff', self.gf('django.db.models.fields.BooleanField')(default=False)),
+            ('is_active', self.gf('django.db.models.fields.BooleanField')(default=True)),
+            ('date_joined', self.gf('django.db.models.fields.DateTimeField')(default=datetime.datetime.now)),
+            ('institution', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
+            ('role', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
+            ('twitter', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
+            ('facebook', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
+            ('google_talk', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True)),
+            ('github', self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True)),
+            ('webpage', self.gf('django.db.models.fields.CharField')(max_length=256, null=True, blank=True)),
+            ('verification_hash', self.gf('django.db.models.fields.CharField')(max_length=32, null=True, blank=True)),
+            ('modified', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+            ('bio', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+        ))
+        db.send_create_signal(u'accounts', ['User'])
+
+        # Adding M2M table for field groups on 'User'
+        m2m_table_name = db.shorten_name(u'accounts_user_groups')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('user', models.ForeignKey(orm[u'accounts.user'], null=False)),
+            ('group', models.ForeignKey(orm[u'auth.group'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['user_id', 'group_id'])
+
+        # Adding M2M table for field user_permissions on 'User'
+        m2m_table_name = db.shorten_name(u'accounts_user_user_permissions')
+        db.create_table(m2m_table_name, (
+            ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+            ('user', models.ForeignKey(orm[u'accounts.user'], null=False)),
+            ('permission', models.ForeignKey(orm[u'auth.permission'], null=False))
+        ))
+        db.create_unique(m2m_table_name, ['user_id', 'permission_id'])
+
+
+    def backwards(self, orm):
+        # Deleting model 'User'
+        db.delete_table(u'accounts_user')
+
+        # Removing M2M table for field groups on 'User'
+        db.delete_table(db.shorten_name(u'accounts_user_groups'))
+
+        # Removing M2M table for field user_permissions on 'User'
+        db.delete_table(db.shorten_name(u'accounts_user_user_permissions'))
+
+
+    models = {
+        u'accounts.user': {
+            'Meta': {'object_name': 'User'},
+            'bio': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'github': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        u'contenttypes.contenttype': {
+            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        }
+    }
+
+    complete_apps = ['accounts']
\ No newline at end of file
diff --git a/src/accounts/migrations/0001_rename_auth_user_to_accounts_user.py b/src/accounts/migrations/0001_rename_auth_user_to_accounts_user.py
deleted file mode 100644
index 8607c34..0000000
--- a/src/accounts/migrations/0001_rename_auth_user_to_accounts_user.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        db.rename_table('auth_user', 'accounts_user')
-        db.rename_table('auth_user_groups', 'accounts_user_groups')
-        db.rename_table('auth_user_user_permissions', 'accounts_user_user_permissions')
-
-    def backwards(self, orm):
-        db.rename_table('accounts_user', 'auth_user')
-        db.rename_table('accounts_user_groups', 'auth_user_groups')
-        db.rename_table('accounts_user_user_permissions', 'auth_user_user_permissions')
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
diff --git a/src/accounts/migrations/0002_delete_sussumu_dup.py b/src/accounts/migrations/0002_delete_sussumu_dup.py
deleted file mode 100644
index e2ec774..0000000
--- a/src/accounts/migrations/0002_delete_sussumu_dup.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        try:
-            sussumu = orm['accounts.User'].objects.get(username='Sussumu')
-        except orm['accounts.User'].DoesNotExist:
-            return
-        profile = orm['super_archives.UserProfile'].objects.get(user_id=sussumu.pk)
-        sussumu.delete()
-        profile.delete()
-
-    def backwards(self, orm):
-        "Write your backwards methods here."
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['accounts.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['accounts', 'super_archives']
-    symmetrical = True
-
diff --git a/src/accounts/migrations/0003_auto__add_field_user_institution__add_field_user_role__add_field_user_.py b/src/accounts/migrations/0003_auto__add_field_user_institution__add_field_user_role__add_field_user_.py
deleted file mode 100644
index d193d38..0000000
--- a/src/accounts/migrations/0003_auto__add_field_user_institution__add_field_user_role__add_field_user_.py
+++ /dev/null
@@ -1,122 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'User.institution'
-        db.add_column(u'accounts_user', 'institution',
-                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
-                      keep_default=False)
-
-        # Adding field 'User.role'
-        db.add_column(u'accounts_user', 'role',
-                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
-                      keep_default=False)
-
-        # Adding field 'User.twitter'
-        db.add_column(u'accounts_user', 'twitter',
-                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
-                      keep_default=False)
-
-        # Adding field 'User.facebook'
-        db.add_column(u'accounts_user', 'facebook',
-                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True),
-                      keep_default=False)
-
-        # Adding field 'User.google_talk'
-        db.add_column(u'accounts_user', 'google_talk',
-                      self.gf('django.db.models.fields.EmailField')(max_length=75, null=True),
-                      keep_default=False)
-
-        # Adding field 'User.webpage'
-        db.add_column(u'accounts_user', 'webpage',
-                      self.gf('django.db.models.fields.CharField')(max_length=256, null=True),
-                      keep_default=False)
-
-        # Adding field 'User.verification_hash'
-        db.add_column(u'accounts_user', 'verification_hash',
-                      self.gf('django.db.models.fields.CharField')(max_length=32, null=True),
-                      keep_default=False)
-
-        # Adding unique constraint on 'User', fields ['email']
-        db.create_unique(u'accounts_user', ['email'])
-
-
-    def backwards(self, orm):
-        # Removing unique constraint on 'User', fields ['email']
-        db.delete_unique(u'accounts_user', ['email'])
-
-        # Deleting field 'User.institution'
-        db.delete_column(u'accounts_user', 'institution')
-
-        # Deleting field 'User.role'
-        db.delete_column(u'accounts_user', 'role')
-
-        # Deleting field 'User.twitter'
-        db.delete_column(u'accounts_user', 'twitter')
-
-        # Deleting field 'User.facebook'
-        db.delete_column(u'accounts_user', 'facebook')
-
-        # Deleting field 'User.google_talk'
-        db.delete_column(u'accounts_user', 'google_talk')
-
-        # Deleting field 'User.webpage'
-        db.delete_column(u'accounts_user', 'webpage')
-
-        # Deleting field 'User.verification_hash'
-        db.delete_column(u'accounts_user', 'verification_hash')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
\ No newline at end of file
diff --git a/src/accounts/migrations/0004_copy_profile_data.py b/src/accounts/migrations/0004_copy_profile_data.py
deleted file mode 100644
index e9d51e2..0000000
--- a/src/accounts/migrations/0004_copy_profile_data.py
+++ /dev/null
@@ -1,81 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        fields = ('institution', 'role', 'twitter', 'facebook',
-                  'google_talk', 'webpage')
-
-        for userprofile in orm['super_archives.UserProfile'].objects.iterator():
-            user = orm['accounts.User'].objects.get(id=userprofile.user_id)
-            for field in fields:
-                setattr(user, field, getattr(userprofile, field))
-            user.save()
-
-    def backwards(self, orm):
-        "Write your backwards methods here."
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['accounts.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
-        }
-    }
-
-    complete_apps = ['accounts']
-    symmetrical = True
diff --git a/src/accounts/migrations/0005_remove_host_from_social_accounts.py b/src/accounts/migrations/0005_remove_host_from_social_accounts.py
deleted file mode 100644
index b5c368b..0000000
--- a/src/accounts/migrations/0005_remove_host_from_social_accounts.py
+++ /dev/null
@@ -1,74 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-import urlparse
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        for user in orm.User.objects.iterator():
-            if user.twitter:
-                user.twitter = user.twitter.split('/')[-1]
-            if user.facebook:
-                if '?' in user.facebook:
-                    query_string = user.facebook.split('?')[-1]
-                    query_dict = dict(urlparse.parse_qsl(query_string))
-                    user.facebook = query_dict.get('id')
-                else:
-                    user.facebook = user.facebook.split('/')[-1]
-
-            user.save()
-
-    def backwards(self, orm):
-        "Write your backwards methods here."
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
-    symmetrical = True
diff --git a/src/accounts/migrations/0006_auto__add_field_user_modified.py b/src/accounts/migrations/0006_auto__add_field_user_modified.py
deleted file mode 100644
index 7ed8115..0000000
--- a/src/accounts/migrations/0006_auto__add_field_user_modified.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-from django.utils import timezone
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'User.modified'
-        db.add_column(u'accounts_user', 'modified',
-                      self.gf('django.db.models.fields.DateTimeField')(auto_now=True, default=timezone.now, blank=True),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'User.modified'
-        db.delete_column(u'accounts_user', 'modified')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
diff --git a/src/accounts/migrations/0007_remove_at_from_username.py b/src/accounts/migrations/0007_remove_at_from_username.py
deleted file mode 100644
index e191d8e..0000000
--- a/src/accounts/migrations/0007_remove_at_from_username.py
+++ /dev/null
@@ -1,69 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        "Write your forwards methods here."
-        # Note: Don't use "from appname.models import ModelName".
-        # Use orm.ModelName to refer to models in this application,
-        # and orm['appname.ModelName'] for models in other applications.
-        for u in orm.User.objects.filter(username__contains='@'):
-            u.username = u.username.split('@')[0]
-            u.save()
-
-    def backwards(self, orm):
-        pass
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
-    symmetrical = True
diff --git a/src/accounts/migrations/0008_auto__add_field_user_bio.py b/src/accounts/migrations/0008_auto__add_field_user_bio.py
deleted file mode 100644
index 8a794f4..0000000
--- a/src/accounts/migrations/0008_auto__add_field_user_bio.py
+++ /dev/null
@@ -1,70 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'User.bio'
-        db.add_column(u'accounts_user', 'bio',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'User.bio'
-        db.delete_column(u'accounts_user', 'bio')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'bio': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
\ No newline at end of file
diff --git a/src/accounts/migrations/0009_auto__add_field_user_identi_ca.py b/src/accounts/migrations/0009_auto__add_field_user_identi_ca.py
deleted file mode 100644
index f04e0d1..0000000
--- a/src/accounts/migrations/0009_auto__add_field_user_identi_ca.py
+++ /dev/null
@@ -1,71 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'User.identi_ca'
-        db.add_column(u'accounts_user', 'identi_ca',
-                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'User.identi_ca'
-        db.delete_column(u'accounts_user', 'identi_ca')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'bio': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'identi_ca': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
\ No newline at end of file
diff --git a/src/accounts/migrations/0010_auto__del_field_user_identi_ca__add_field_user_github.py b/src/accounts/migrations/0010_auto__del_field_user_identi_ca__add_field_user_github.py
deleted file mode 100644
index a7a696d..0000000
--- a/src/accounts/migrations/0010_auto__del_field_user_identi_ca__add_field_user_github.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'User.identi_ca'
-        db.delete_column(u'accounts_user', 'identi_ca')
-
-        # Adding field 'User.github'
-        db.add_column(u'accounts_user', 'github',
-                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Adding field 'User.identi_ca'
-        db.add_column(u'accounts_user', 'identi_ca',
-                      self.gf('django.db.models.fields.CharField')(max_length=128, null=True, blank=True),
-                      keep_default=False)
-
-        # Deleting field 'User.github'
-        db.delete_column(u'accounts_user', 'github')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'bio': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'github': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['accounts']
\ No newline at end of file
diff --git a/src/badger/migrations/0001_initial.py b/src/badger/migrations/0001_initial.py
index 4d9c4bf..62df770 100644
--- a/src/badger/migrations/0001_initial.py
+++ b/src/badger/migrations/0001_initial.py
@@ -11,13 +11,14 @@ class Migration(SchemaMigration):
         # Adding model 'Badge'
         db.create_table(u'badger_badge', (
             (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('description', self.gf('django.db.models.fields.CharField')(max_length=200)),
-            ('image', self.gf('django.db.models.fields.files.ImageField')(max_length=100)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+            ('description', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+            ('image_base64', self.gf('django.db.models.fields.TextField')()),
             ('type', self.gf('django.db.models.fields.CharField')(max_length=200)),
             ('user_attr', self.gf('django.db.models.fields.CharField')(max_length=100, null=True, blank=True)),
             ('comparison', self.gf('django.db.models.fields.CharField')(max_length=10, null=True, blank=True)),
             ('value', self.gf('django.db.models.fields.PositiveSmallIntegerField')(null=True, blank=True)),
+            ('order', self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=100)),
         ))
         db.send_create_signal(u'badger', ['Badge'])
 
@@ -30,22 +31,43 @@ class Migration(SchemaMigration):
         ))
         db.create_unique(m2m_table_name, ['badge_id', 'user_id'])
 
+        # Adding model 'BadgeI18N'
+        db.create_table(u'badger_badgei18n', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('i18n_language', self.gf('django.db.models.fields.CharField')(max_length=10)),
+            ('title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+            ('description', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
+            ('i18n_source', self.gf('django.db.models.fields.related.ForeignKey')(related_name='translations', to=orm['badger.Badge'])),
+        ))
+        db.send_create_signal(u'badger', ['BadgeI18N'])
+
+        # Adding unique constraint on 'BadgeI18N', fields ['i18n_source', 'i18n_language']
+        db.create_unique(u'badger_badgei18n', ['i18n_source_id', 'i18n_language'])
+
 
     def backwards(self, orm):
+        # Removing unique constraint on 'BadgeI18N', fields ['i18n_source', 'i18n_language']
+        db.delete_unique(u'badger_badgei18n', ['i18n_source_id', 'i18n_language'])
+
         # Deleting model 'Badge'
         db.delete_table(u'badger_badge')
 
         # Removing M2M table for field awardees on 'Badge'
         db.delete_table(db.shorten_name(u'badger_badge_awardees'))
 
+        # Deleting model 'BadgeI18N'
+        db.delete_table(u'badger_badgei18n')
+
 
     models = {
         u'accounts.user': {
             'Meta': {'object_name': 'User'},
+            'bio': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
             'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'github': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
             'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
             'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
@@ -55,6 +77,7 @@ class Migration(SchemaMigration):
             'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
             'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
             'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
@@ -77,17 +100,26 @@ class Migration(SchemaMigration):
             'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
         u'badger.badge': {
-            'Meta': {'object_name': 'Badge'},
+            'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
             'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
             'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'image_base64': ('django.db.models.fields.TextField', [], {}),
+            'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
             'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
             'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
         },
+        u'badger.badgei18n': {
+            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
+            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
+            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
+            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
+        },
         u'contenttypes.contenttype': {
             'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
             'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
diff --git a/src/badger/migrations/0002_auto__add_field_badge_title_en__add_field_badge_title_es__add_field_ba.py b/src/badger/migrations/0002_auto__add_field_badge_title_en__add_field_badge_title_es__add_field_ba.py
deleted file mode 100644
index 132e0d3..0000000
--- a/src/badger/migrations/0002_auto__add_field_badge_title_en__add_field_badge_title_es__add_field_ba.py
+++ /dev/null
@@ -1,120 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Badge.title_en'
-        db.add_column(u'badger_badge', 'title_en',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-        # Adding field 'Badge.title_es'
-        db.add_column(u'badger_badge', 'title_es',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-        # Adding field 'Badge.description_en'
-        db.add_column(u'badger_badge', 'description_en',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-        # Adding field 'Badge.description_es'
-        db.add_column(u'badger_badge', 'description_es',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-
-        # Changing field 'Badge.description'
-        db.alter_column(u'badger_badge', 'description', self.gf('django.db.models.fields.CharField')(max_length=200, null=True))
-
-        # Changing field 'Badge.title'
-        db.alter_column(u'badger_badge', 'title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True))
-
-    def backwards(self, orm):
-        # Deleting field 'Badge.title_en'
-        db.delete_column(u'badger_badge', 'title_en')
-
-        # Deleting field 'Badge.title_es'
-        db.delete_column(u'badger_badge', 'title_es')
-
-        # Deleting field 'Badge.description_en'
-        db.delete_column(u'badger_badge', 'description_en')
-
-        # Deleting field 'Badge.description_es'
-        db.delete_column(u'badger_badge', 'description_es')
-
-
-        # Changing field 'Badge.description'
-        db.alter_column(u'badger_badge', 'description', self.gf('django.db.models.fields.CharField')(default='', max_length=200))
-
-        # Changing field 'Badge.title'
-        db.alter_column(u'badger_badge', 'title', self.gf('django.db.models.fields.CharField')(default='', max_length=200))
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'badger.badge': {
-            'Meta': {'object_name': 'Badge'},
-            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
-            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'description_en': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'description_es': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'title_en': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'title_es': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['badger']
\ No newline at end of file
diff --git a/src/badger/migrations/0003_auto__add_badgei18n__add_unique_badgei18n_i18n_source_i18n_language__d.py b/src/badger/migrations/0003_auto__add_badgei18n__add_unique_badgei18n_i18n_source_i18n_language__d.py
deleted file mode 100644
index 7f27e98..0000000
--- a/src/badger/migrations/0003_auto__add_badgei18n__add_unique_badgei18n_i18n_source_i18n_language__d.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'BadgeI18N'
-        db.create_table(u'badger_badgei18n', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('i18n_language', self.gf('django.db.models.fields.CharField')(max_length=10)),
-            ('title', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
-            ('description', self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True)),
-            ('i18n_source', self.gf('django.db.models.fields.related.ForeignKey')(related_name='translations', to=orm['badger.Badge'])),
-        ))
-        db.send_create_signal(u'badger', ['BadgeI18N'])
-
-        # Adding unique constraint on 'BadgeI18N', fields ['i18n_source', 'i18n_language']
-        db.create_unique(u'badger_badgei18n', ['i18n_source_id', 'i18n_language'])
-
-        # Deleting field 'Badge.title_en'
-        db.delete_column(u'badger_badge', 'title_en')
-
-        # Deleting field 'Badge.description_en'
-        db.delete_column(u'badger_badge', 'description_en')
-
-        # Deleting field 'Badge.title_es'
-        db.delete_column(u'badger_badge', 'title_es')
-
-        # Deleting field 'Badge.description_es'
-        db.delete_column(u'badger_badge', 'description_es')
-
-
-    def backwards(self, orm):
-        # Removing unique constraint on 'BadgeI18N', fields ['i18n_source', 'i18n_language']
-        db.delete_unique(u'badger_badgei18n', ['i18n_source_id', 'i18n_language'])
-
-        # Deleting model 'BadgeI18N'
-        db.delete_table(u'badger_badgei18n')
-
-        # Adding field 'Badge.title_en'
-        db.add_column(u'badger_badge', 'title_en',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-        # Adding field 'Badge.description_en'
-        db.add_column(u'badger_badge', 'description_en',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-        # Adding field 'Badge.title_es'
-        db.add_column(u'badger_badge', 'title_es',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-        # Adding field 'Badge.description_es'
-        db.add_column(u'badger_badge', 'description_es',
-                      self.gf('django.db.models.fields.CharField')(max_length=200, null=True, blank=True),
-                      keep_default=False)
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'badger.badge': {
-            'Meta': {'object_name': 'Badge'},
-            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
-            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
-        },
-        u'badger.badgei18n': {
-            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
-            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['badger']
\ No newline at end of file
diff --git a/src/badger/migrations/0004_auto__add_field_badge_order.py b/src/badger/migrations/0004_auto__add_field_badge_order.py
deleted file mode 100644
index e840f3d..0000000
--- a/src/badger/migrations/0004_auto__add_field_badge_order.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Badge.order'
-        db.add_column(u'badger_badge', 'order',
-                      self.gf('django.db.models.fields.PositiveSmallIntegerField')(default=100),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'Badge.order'
-        db.delete_column(u'badger_badge', 'order')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'badger.badge': {
-            'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
-            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
-            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
-        },
-        u'badger.badgei18n': {
-            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
-            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['badger']
\ No newline at end of file
diff --git a/src/badger/migrations/0005_auto__add_field_badge_image_base64.py b/src/badger/migrations/0005_auto__add_field_badge_image_base64.py
deleted file mode 100644
index 19eba57..0000000
--- a/src/badger/migrations/0005_auto__add_field_badge_image_base64.py
+++ /dev/null
@@ -1,91 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding field 'Badge.image_base64'
-        db.add_column(u'badger_badge', 'image_base64',
-                      self.gf('django.db.models.fields.TextField')(default=''),
-                      keep_default=False)
-
-
-    def backwards(self, orm):
-        # Deleting field 'Badge.image_base64'
-        db.delete_column(u'badger_badge', 'image_base64')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'badger.badge': {
-            'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
-            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
-            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'image_base64': ('django.db.models.fields.TextField', [], {}),
-            'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
-        },
-        u'badger.badgei18n': {
-            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
-            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['badger']
\ No newline at end of file
diff --git a/src/badger/migrations/0006_imgpath_to_base64_field.py b/src/badger/migrations/0006_imgpath_to_base64_field.py
deleted file mode 100644
index b1884ac..0000000
--- a/src/badger/migrations/0006_imgpath_to_base64_field.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-import base64
-import os
-
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-from django.conf import settings
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        for obj in orm.Badge.objects.all():
-            img = open(os.path.join(settings.MEDIA_ROOT, obj.image.path))
-            obj.image_base64 = base64.b64encode(img.read())
-            obj.save()
-
-    def backwards(self, orm):
-        for obj in orm.Badge.objects.all():
-            obj.image_base64 = ''
-            obj.save()
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'badger.badge': {
-            'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
-            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
-            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image': ('django.db.models.fields.files.ImageField', [], {'max_length': '100'}),
-            'image_base64': ('django.db.models.fields.TextField', [], {}),
-            'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
-        },
-        u'badger.badgei18n': {
-            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
-            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['badger']
-    symmetrical = True
diff --git a/src/badger/migrations/0007_auto__del_field_badge_image.py b/src/badger/migrations/0007_auto__del_field_badge_image.py
deleted file mode 100644
index 963a336..0000000
--- a/src/badger/migrations/0007_auto__del_field_badge_image.py
+++ /dev/null
@@ -1,90 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting field 'Badge.image'
-        db.delete_column(u'badger_badge', 'image')
-
-
-    def backwards(self, orm):
-        # Adding field 'Badge.image'
-        db.add_column(u'badger_badge', 'image',
-                      self.gf('django.db.models.fields.files.ImageField')(default='', max_length=100),
-                      keep_default=False)
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'badger.badge': {
-            'Meta': {'ordering': "['order']", 'object_name': 'Badge'},
-            'awardees': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': u"orm['accounts.User']", 'null': 'True', 'blank': 'True'}),
-            'comparison': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'image_base64': ('django.db.models.fields.TextField', [], {}),
-            'order': ('django.db.models.fields.PositiveSmallIntegerField', [], {'default': '100'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'type': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
-            'user_attr': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}),
-            'value': ('django.db.models.fields.PositiveSmallIntegerField', [], {'null': 'True', 'blank': 'True'})
-        },
-        u'badger.badgei18n': {
-            'Meta': {'unique_together': "(('i18n_source', 'i18n_language'),)", 'object_name': 'BadgeI18N'},
-            'description': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
-            'i18n_language': ('django.db.models.fields.CharField', [], {'max_length': '10'}),
-            'i18n_source': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'translations'", 'to': u"orm['badger.Badge']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'title': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        }
-    }
-
-    complete_apps = ['badger']
\ No newline at end of file
diff --git a/src/proxy/migrations/0001_create_views.py b/src/proxy/migrations/0001_create_views.py
deleted file mode 100644
index da142dd..0000000
--- a/src/proxy/migrations/0001_create_views.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from django.db import connections
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-            CREATE OR REPLACE VIEW wiki_view AS SELECT
-                wiki.name AS name,
-                (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
-                 AND wiki2.version = MAX(wiki.version)) AS wiki_text,
-                (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
-                 AND wiki3.version = 1) AS author,
-                string_agg(DISTINCT wiki.author, ', ') AS collaborators,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS created,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS modified
-            FROM wiki
-            GROUP BY wiki.name;
-
-            CREATE OR REPLACE VIEW ticket_view AS SELECT
-                ticket.id AS id,
-                ticket.summary as summary,
-                ticket.description as description,
-                ticket.milestone as milestone,
-                ticket.priority as priority,
-                ticket.component as component,
-                ticket.version as version,
-                ticket.severity as severity,
-                ticket.reporter as reporter,
-                ticket.reporter as author,
-                ticket.status as status,
-                ticket.keywords as keywords,
-                (SELECT
-                    string_agg(DISTINCT ticket_change.author, ', ')
-                    FROM ticket_change WHERE ticket_change.ticket = ticket.id
-                    GROUP BY ticket_change.ticket) as collaborators,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000)* INTERVAL '1s' AS created,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (changetime/1000000) * INTERVAL '1s' AS modified
-            FROM ticket;
-
-            CREATE OR REPLACE VIEW revision_view AS SELECT
-                revision.rev,
-                revision.author,
-                revision.message,
-                repository.value AS repository_name,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (revision.time/1000000) * INTERVAL '1s' AS created
-            FROM revision
-            INNER JOIN repository ON(
-                repository.id = revision.repos
-                AND repository.name = 'name'
-                AND repository.value != ''
-            );
-        ''')
-
-    def backwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-            DROP VIEW IF EXISTS revision_view;
-            DROP VIEW IF EXISTS ticket_view;
-            DROP VIEW IF EXISTS wiki_view;
-        ''')
-
-
-    models = {
-        u'proxy.revision': {
-            'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'rev': ('django.db.models.fields.TextField', [], {'primary_key': 'True'})
-        },
-        u'proxy.ticket': {
-            'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        },
-        u'proxy.wiki': {
-            'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['proxy']
-    symmetrical = True
diff --git a/src/proxy/migrations/0001_initial.py b/src/proxy/migrations/0001_initial.py
new file mode 100644
index 0000000..c3c0aa2
--- /dev/null
+++ b/src/proxy/migrations/0001_initial.py
@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        pass
+
+    def backwards(self, orm):
+        pass
+
+    models = {
+        u'proxy.attachment': {
+            'Meta': {'object_name': 'Attachment', 'db_table': "'attachment_view'", 'managed': 'False'},
+            'attach_id': ('django.db.models.fields.TextField', [], {}),
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'filename': ('django.db.models.fields.TextField', [], {}),
+            'mimetype': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'size': ('django.db.models.fields.IntegerField', [], {'blank': 'True'}),
+            'url': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'used_by': ('django.db.models.fields.TextField', [], {})
+        },
+        u'proxy.revision': {
+            'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'key': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'rev': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'proxy.ticket': {
+            'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
+            'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'modified_by': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'proxy.ticketcollabcount': {
+            'Meta': {'object_name': 'TicketCollabCount', 'db_table': "'ticket_collab_count_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'count': ('django.db.models.fields.IntegerField', [], {})
+        },
+        u'proxy.wiki': {
+            'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+            'modified_by': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
+        },
+        u'proxy.wikicollabcount': {
+            'Meta': {'object_name': 'WikiCollabCount', 'db_table': "'wiki_collab_count_view'", 'managed': 'False'},
+            'author': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
+            'count': ('django.db.models.fields.IntegerField', [], {})
+        }
+    }
+
+    complete_apps = ['proxy']
\ No newline at end of file
diff --git a/src/proxy/migrations/0002_add_key_to_revision_view.py b/src/proxy/migrations/0002_add_key_to_revision_view.py
deleted file mode 100644
index a9620e4..0000000
--- a/src/proxy/migrations/0002_add_key_to_revision_view.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from django.db import connections
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-            CREATE OR REPLACE VIEW revision_view AS SELECT
-                revision.rev,
-                revision.author,
-                revision.message,
-                repository.value AS repository_name,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (revision.time/1000000) * INTERVAL '1s' AS created,
-                CONCAT(revision.repos, '-', revision.rev) AS key
-            FROM revision
-            INNER JOIN repository ON(
-                repository.id = revision.repos
-                AND repository.name = 'name'
-                AND repository.value != ''
-            );
-        ''')
-
-    def backwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-                ALTER VIEW revision_view ALTER COLUMN key DROP DEFAULT;
-        ''')
-
-    models = {
-        u'proxy.revision': {
-            'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'rev': ('django.db.models.fields.TextField', [], {'primary_key': 'True'})
-        },
-        u'proxy.ticket': {
-            'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        },
-        u'proxy.wiki': {
-            'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['proxy']
-    symmetrical = True
diff --git a/src/proxy/migrations/0003_create_attachment_view.py b/src/proxy/migrations/0003_create_attachment_view.py
deleted file mode 100644
index 16b6c18..0000000
--- a/src/proxy/migrations/0003_create_attachment_view.py
+++ /dev/null
@@ -1,87 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from django.db import connections
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-            CREATE OR REPLACE VIEW attachment_view AS SELECT
-                CONCAT(attachment.type, '/' , attachment.id, '/', attachment.filename) AS url,
-                attachment.type AS used_by,
-                attachment.filename AS filename,
-                attachment.id as attach_id,
-                (SELECT LOWER(SUBSTRING(attachment.filename FROM '\.(\w+)$'))) AS mimetype,
-                attachment.author AS author,
-                attachment.description AS description,
-                attachment.size AS size,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (attachment.time/1000000)* INTERVAL '1s' AS created
-            FROM attachment;
-        ''')
-
-    def backwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('DROP VIEW IF EXISTS attachment_view;')
-
-    models = {
-        u'proxy.attachment': {
-            'Meta': {'object_name': 'Attachment', 'db_table': "'attachment'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'filename': ('django.db.models.fields.TextField', [], {}),
-            'id': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'size': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}),
-            'time': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
-            'type': ('django.db.models.fields.TextField', [], {})
-        },
-        u'proxy.revision': {
-            'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'rev': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        },
-        u'proxy.ticket': {
-            'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        },
-        u'proxy.wiki': {
-            'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['proxy']
-    symmetrical = True
diff --git a/src/proxy/migrations/0004_replace_wiki_view.py b/src/proxy/migrations/0004_replace_wiki_view.py
deleted file mode 100644
index 9b55ace..0000000
--- a/src/proxy/migrations/0004_replace_wiki_view.py
+++ /dev/null
@@ -1,102 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from django.db import connections
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-
-        cursor.execute('''
-            CREATE OR REPLACE VIEW wiki_view AS SELECT
-                wiki.name AS name,
-                (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
-                 AND wiki2.version = MAX(wiki.version)) AS wiki_text,
-                (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
-                 AND wiki3.version = 1) AS author,
-                string_agg(DISTINCT wiki.author, ', ') AS collaborators,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS created,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS modified
-            FROM wiki
-            GROUP BY wiki.name;
-        ''')
-
-    def backwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-
-        cursor.execute('''
-            CREATE OR REPLACE VIEW wiki_view AS SELECT
-                wiki.name AS name,
-                (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
-                 AND wiki2.version = MAX(wiki.version)) AS wiki_text,
-                (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
-                 AND wiki3.version = 1) AS author,
-                string_agg(DISTINCT wiki.author, ', ') AS collaborators,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS created,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS modified
-            FROM wiki
-            GROUP BY wiki.name;
-        ''')
-
-    models = {
-        u'proxy.attachment': {
-            'Meta': {'object_name': 'Attachment', 'db_table': "'attachment_view'", 'managed': 'False'},
-            'attach_id': ('django.db.models.fields.TextField', [], {}),
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'filename': ('django.db.models.fields.TextField', [], {}),
-            'mimetype': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'size': ('django.db.models.fields.IntegerField', [], {'blank': 'True'}),
-            'url': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'used_by': ('django.db.models.fields.TextField', [], {})
-        },
-        u'proxy.revision': {
-            'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'rev': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        },
-        u'proxy.ticket': {
-            'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        },
-        u'proxy.wiki': {
-            'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['proxy']
-    symmetrical = True
diff --git a/src/proxy/migrations/0005_adding_modified_by.py b/src/proxy/migrations/0005_adding_modified_by.py
deleted file mode 100644
index 74402b2..0000000
--- a/src/proxy/migrations/0005_adding_modified_by.py
+++ /dev/null
@@ -1,125 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from django.db import connections
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-            CREATE OR REPLACE VIEW wiki_view AS SELECT
-                wiki.name AS name,
-                (SELECT wiki2.text FROM wiki AS wiki2 WHERE wiki2.name = wiki.name
-                 AND wiki2.version = MAX(wiki.version)) AS wiki_text,
-                (SELECT wiki3.author FROM wiki AS wiki3 WHERE wiki3.name = wiki.name
-                 AND wiki3.version = 1) AS author,
-                string_agg(DISTINCT wiki.author, ', ') AS collaborators,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (MIN(wiki.time)/1000000) * INTERVAL '1s' AS created,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (MAX(wiki.time)/1000000) * INTERVAL '1s' AS modified,
-                (SELECT wiki4.author FROM wiki AS wiki4 WHERE wiki4.name = wiki.name
-                 AND wiki4.version = MAX(wiki.version)) AS modified_by
-            FROM wiki
-            GROUP BY wiki.name;
-
-            CREATE OR REPLACE VIEW ticket_view AS SELECT
-                ticket.id AS id,
-                ticket.summary as summary,
-                ticket.description as description,
-                ticket.milestone as milestone,
-                ticket.priority as priority,
-                ticket.component as component,
-                ticket.version as version,
-                ticket.severity as severity,
-                ticket.reporter as reporter,
-                ticket.reporter as author,
-                ticket.status as status,
-                ticket.keywords as keywords,
-                (SELECT
-                    string_agg(DISTINCT ticket_change.author, ', ')
-                    FROM ticket_change WHERE ticket_change.ticket = ticket.id
-                    GROUP BY ticket_change.ticket) as collaborators,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (time/1000000)* INTERVAL '1s' AS created,
-                TIMESTAMP WITH TIME ZONE 'epoch' + (changetime/1000000) * INTERVAL '1s' AS modified,
-                (SELECT
-                    ticket_change.author
-                 FROM ticket_change
-                 WHERE ticket_change.ticket = ticket.id
-                    AND ticket_change.time = ticket.changetime
-                 LIMIT 1
-                ) AS modified_by
-            FROM ticket;
-	    ''')
-
-
-    def backwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-            ALTER VIEW wiki_view ALTER COLUMN modified_by DROP DEFAULT;
-            ALTER VIEW ticket_view ALTER COLUMN modified_by DROP DEFAULT;
-	    ''')
-
-
-    models = {
-        u'proxy.attachment': {
-            'Meta': {'object_name': 'Attachment', 'db_table': "'attachment_view'", 'managed': 'False'},
-            'attach_id': ('django.db.models.fields.TextField', [], {}),
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'filename': ('django.db.models.fields.TextField', [], {}),
-            'mimetype': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'size': ('django.db.models.fields.IntegerField', [], {'blank': 'True'}),
-            'url': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'used_by': ('django.db.models.fields.TextField', [], {})
-        },
-        u'proxy.revision': {
-            'Meta': {'object_name': 'Revision', 'db_table': "'revision_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'key': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'repository_name': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'rev': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        },
-        u'proxy.ticket': {
-            'Meta': {'object_name': 'Ticket', 'db_table': "'ticket_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'component': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'id': ('django.db.models.fields.IntegerField', [], {'primary_key': 'True'}),
-            'keywords': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'milestone': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'modified_by': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'priority': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'reporter': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'severity': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'status': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'summary': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'version': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        },
-        u'proxy.wiki': {
-            'Meta': {'object_name': 'Wiki', 'db_table': "'wiki_view'", 'managed': 'False'},
-            'author': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'collaborators': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'modified': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
-            'modified_by': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
-            'name': ('django.db.models.fields.TextField', [], {'primary_key': 'True'}),
-            'wiki_text': ('django.db.models.fields.TextField', [], {'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['proxy']
-    symmetrical = True
diff --git a/src/proxy/migrations/0006_views_to_count_collabs.py b/src/proxy/migrations/0006_views_to_count_collabs.py
deleted file mode 100644
index 1aa4663..0000000
--- a/src/proxy/migrations/0006_views_to_count_collabs.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.db import connections
-from south.v2 import DataMigration
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-            CREATE OR REPLACE VIEW ticket_collab_count_view AS
-                SELECT
-                    COALESCE (t1.author, t2.author) as author,
-                    (COALESCE(t1.count, 0) + COALESCE(t2.count, 0)) as count
-                FROM
-                    (SELECT author, count(*) as count
-                     FROM ticket_change
-                     GROUP BY author
-                     ORDER BY author
-                    ) AS t1
-                FULL OUTER JOIN
-                    (SELECT reporter as author, count(*) as count
-                     FROM ticket
-                     GROUP BY reporter
-                     ORDER BY reporter
-                    ) AS t2
-                ON t1.author = t2.author;
-
-            CREATE OR REPLACE VIEW wiki_collab_count_view AS
-                SELECT author, count(*) from wiki GROUP BY author;
-        ''')
-
-    def backwards(self, orm):
-        # Selecting trac database
-        connection = connections['trac']
-
-        cursor = connection.cursor()
-        cursor.execute('''
-            DROP VIEW ticket_collab_count_view;
-            DROP VIEW wiki_collab_count_view;
-        ''')
-
-    complete_apps = ['proxy']
-    symmetrical = True
diff --git a/src/super_archives/migrations/0001_initial.py b/src/super_archives/migrations/0001_initial.py
index cbf3c99..9490c21 100644
--- a/src/super_archives/migrations/0001_initial.py
+++ b/src/super_archives/migrations/0001_initial.py
@@ -1,255 +1,299 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
 import datetime
 from south.db import db
 from south.v2 import SchemaMigration
 from django.db import models
 
+
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        
-        # Adding model 'PageHit'
-        db.create_table('super_archives_pagehit', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('url_path', self.gf('django.db.models.fields.CharField')(unique=True, max_length=2048, db_index=True)),
-            ('hit_count', self.gf('django.db.models.fields.IntegerField')(default=0)),
+        # Adding model 'EmailAddressValidation'
+        db.create_table(u'super_archives_emailaddressvalidation', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('address', self.gf('django.db.models.fields.EmailField')(unique=True, max_length=75)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='emails_not_validated', null=True, to=orm['accounts.User'])),
+            ('validation_key', self.gf('django.db.models.fields.CharField')(default='143df80aa814429f9938d3b165148480', max_length=32, null=True)),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
         ))
-        db.send_create_signal('super_archives', ['PageHit'])
+        db.send_create_signal(u'super_archives', ['EmailAddressValidation'])
+
+        # Adding unique constraint on 'EmailAddressValidation', fields ['user', 'address']
+        db.create_unique(u'super_archives_emailaddressvalidation', ['user_id', 'address'])
 
         # Adding model 'EmailAddress'
-        db.create_table('super_archives_emailaddress', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='emails', null=True, to=orm['auth.User'])),
+        db.create_table(u'super_archives_emailaddress', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='emails', null=True, on_delete=models.SET_NULL, to=orm['accounts.User'])),
             ('address', self.gf('django.db.models.fields.EmailField')(unique=True, max_length=75)),
-            ('real_name', self.gf('django.db.models.fields.CharField')(max_length=64, blank=True)),
+            ('real_name', self.gf('django.db.models.fields.CharField')(db_index=True, max_length=64, blank=True)),
             ('md5', self.gf('django.db.models.fields.CharField')(max_length=32, null=True)),
         ))
-        db.send_create_signal('super_archives', ['EmailAddress'])
-
-        # Adding model 'UserProfile'
-        db.create_table('super_archives_userprofile', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
-            ('institution', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
-            ('role', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
-            ('twitter', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
-            ('facebook', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
-            ('google_talk', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True)),
-            ('webpage', self.gf('django.db.models.fields.CharField')(max_length=256)),
-        ))
-        db.send_create_signal('super_archives', ['UserProfile'])
+        db.send_create_signal(u'super_archives', ['EmailAddress'])
 
         # Adding model 'MailingList'
-        db.create_table('super_archives_mailinglist', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        db.create_table(u'super_archives_mailinglist', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('name', self.gf('django.db.models.fields.CharField')(max_length=80)),
             ('email', self.gf('django.db.models.fields.EmailField')(max_length=75)),
             ('description', self.gf('django.db.models.fields.TextField')()),
             ('logo', self.gf('django.db.models.fields.files.FileField')(max_length=100)),
             ('last_imported_index', self.gf('django.db.models.fields.IntegerField')(default=0)),
         ))
-        db.send_create_signal('super_archives', ['MailingList'])
+        db.send_create_signal(u'super_archives', ['MailingList'])
 
         # Adding model 'MailingListMembership'
-        db.create_table('super_archives_mailinglistmembership', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+        db.create_table(u'super_archives_mailinglistmembership', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['accounts.User'])),
             ('mailinglist', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.MailingList'])),
         ))
-        db.send_create_signal('super_archives', ['MailingListMembership'])
+        db.send_create_signal(u'super_archives', ['MailingListMembership'])
+
+        # Adding model 'Keyword'
+        db.create_table(u'super_archives_keyword', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('keyword', self.gf('django.db.models.fields.CharField')(max_length='128')),
+            ('weight', self.gf('django.db.models.fields.IntegerField')(default=0)),
+            ('thread', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.Thread'])),
+        ))
+        db.send_create_signal(u'super_archives', ['Keyword'])
 
         # Adding model 'Thread'
-        db.create_table('super_archives_thread', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        db.create_table(u'super_archives_thread', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('subject_token', self.gf('django.db.models.fields.CharField')(max_length=512)),
             ('mailinglist', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.MailingList'])),
             ('latest_message', self.gf('django.db.models.fields.related.OneToOneField')(related_name='+', unique=True, null=True, to=orm['super_archives.Message'])),
+            ('score', self.gf('django.db.models.fields.IntegerField')(default=0)),
+            ('spam', self.gf('django.db.models.fields.BooleanField')(default=False)),
         ))
-        db.send_create_signal('super_archives', ['Thread'])
+        db.send_create_signal(u'super_archives', ['Thread'])
 
         # Adding unique constraint on 'Thread', fields ['subject_token', 'mailinglist']
-        db.create_unique('super_archives_thread', ['subject_token', 'mailinglist_id'])
+        db.create_unique(u'super_archives_thread', ['subject_token', 'mailinglist_id'])
 
         # Adding model 'Vote'
-        db.create_table('super_archives_vote', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User'])),
+        db.create_table(u'super_archives_vote', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('user', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['accounts.User'])),
             ('message', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.Message'])),
+            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
         ))
-        db.send_create_signal('super_archives', ['Vote'])
+        db.send_create_signal(u'super_archives', ['Vote'])
 
         # Adding unique constraint on 'Vote', fields ['user', 'message']
-        db.create_unique('super_archives_vote', ['user_id', 'message_id'])
+        db.create_unique(u'super_archives_vote', ['user_id', 'message_id'])
 
         # Adding model 'Message'
-        db.create_table('super_archives_message', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        db.create_table(u'super_archives_message', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('from_address', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.EmailAddress'])),
-            ('mailinglist', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.MailingList'])),
             ('thread', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.Thread'], null=True)),
-            ('subject', self.gf('django.db.models.fields.CharField')(max_length=512)),
-            ('subject_clean', self.gf('django.db.models.fields.CharField')(max_length=512)),
+            ('subject', self.gf('django.db.models.fields.CharField')(max_length=512, db_index=True)),
+            ('subject_clean', self.gf('django.db.models.fields.CharField')(max_length=512, db_index=True)),
             ('body', self.gf('django.db.models.fields.TextField')(default='')),
-            ('received_time', self.gf('django.db.models.fields.DateTimeField')()),
+            ('received_time', self.gf('django.db.models.fields.DateTimeField')(db_index=True)),
             ('message_id', self.gf('django.db.models.fields.CharField')(max_length=512)),
+            ('spam', self.gf('django.db.models.fields.BooleanField')(default=False)),
         ))
-        db.send_create_signal('super_archives', ['Message'])
+        db.send_create_signal(u'super_archives', ['Message'])
+
+        # Adding unique constraint on 'Message', fields ['thread', 'message_id']
+        db.create_unique(u'super_archives_message', ['thread_id', 'message_id'])
+
+        # Adding model 'MessageBlock'
+        db.create_table(u'super_archives_messageblock', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('message', self.gf('django.db.models.fields.related.ForeignKey')(related_name='blocks', to=orm['super_archives.Message'])),
+            ('text', self.gf('django.db.models.fields.TextField')()),
+            ('is_reply', self.gf('django.db.models.fields.BooleanField')()),
+            ('order', self.gf('django.db.models.fields.IntegerField')()),
+        ))
+        db.send_create_signal(u'super_archives', ['MessageBlock'])
 
         # Adding model 'MessageMetadata'
-        db.create_table('super_archives_messagemetadata', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+        db.create_table(u'super_archives_messagemetadata', (
+            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
             ('Message', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.Message'])),
             ('name', self.gf('django.db.models.fields.CharField')(max_length=512)),
             ('value', self.gf('django.db.models.fields.TextField')()),
         ))
-        db.send_create_signal('super_archives', ['MessageMetadata'])
+        db.send_create_signal(u'super_archives', ['MessageMetadata'])
 
 
     def backwards(self, orm):
-        
+        # Removing unique constraint on 'Message', fields ['thread', 'message_id']
+        db.delete_unique(u'super_archives_message', ['thread_id', 'message_id'])
+
         # Removing unique constraint on 'Vote', fields ['user', 'message']
-        db.delete_unique('super_archives_vote', ['user_id', 'message_id'])
+        db.delete_unique(u'super_archives_vote', ['user_id', 'message_id'])
 
         # Removing unique constraint on 'Thread', fields ['subject_token', 'mailinglist']
-        db.delete_unique('super_archives_thread', ['subject_token', 'mailinglist_id'])
+        db.delete_unique(u'super_archives_thread', ['subject_token', 'mailinglist_id'])
 
-        # Deleting model 'PageHit'
-        db.delete_table('super_archives_pagehit')
+        # Removing unique constraint on 'EmailAddressValidation', fields ['user', 'address']
+        db.delete_unique(u'super_archives_emailaddressvalidation', ['user_id', 'address'])
 
-        # Deleting model 'EmailAddress'
-        db.delete_table('super_archives_emailaddress')
+        # Deleting model 'EmailAddressValidation'
+        db.delete_table(u'super_archives_emailaddressvalidation')
 
-        # Deleting model 'UserProfile'
-        db.delete_table('super_archives_userprofile')
+        # Deleting model 'EmailAddress'
+        db.delete_table(u'super_archives_emailaddress')
 
         # Deleting model 'MailingList'
-        db.delete_table('super_archives_mailinglist')
+        db.delete_table(u'super_archives_mailinglist')
 
         # Deleting model 'MailingListMembership'
-        db.delete_table('super_archives_mailinglistmembership')
+        db.delete_table(u'super_archives_mailinglistmembership')
+
+        # Deleting model 'Keyword'
+        db.delete_table(u'super_archives_keyword')
 
         # Deleting model 'Thread'
-        db.delete_table('super_archives_thread')
+        db.delete_table(u'super_archives_thread')
 
         # Deleting model 'Vote'
-        db.delete_table('super_archives_vote')
+        db.delete_table(u'super_archives_vote')
 
         # Deleting model 'Message'
-        db.delete_table('super_archives_message')
+        db.delete_table(u'super_archives_message')
+
+        # Deleting model 'MessageBlock'
+        db.delete_table(u'super_archives_messageblock')
 
         # Deleting model 'MessageMetadata'
-        db.delete_table('super_archives_messagemetadata')
+        db.delete_table(u'super_archives_messagemetadata')
 
 
     models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
+        u'accounts.user': {
             'Meta': {'object_name': 'User'},
+            'bio': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}),
             'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
+            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
             'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'github': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
             'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
             'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
             'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'modified': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
             'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
+            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
+            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
+        },
+        u'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+        },
+        u'auth.permission': {
+            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
         },
-        'contenttypes.contenttype': {
+        u'contenttypes.contenttype': {
             'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
             'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
         },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
+        u'super_archives.emailaddress': {
+            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
             'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
+            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
+        },
+        u'super_archives.emailaddressvalidation': {
+            'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'},
+            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
+            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'aa4ac05f39464a05932308e9fda2daf5'", 'max_length': '32', 'null': 'True'})
         },
-        'super_archives.mailinglist': {
+        u'super_archives.keyword': {
+            'Meta': {'ordering': "('?',)", 'object_name': 'Keyword'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'keyword': ('django.db.models.fields.CharField', [], {'max_length': "'128'"}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']"}),
+            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
+        },
+        u'super_archives.mailinglist': {
             'Meta': {'object_name': 'MailingList'},
             'description': ('django.db.models.fields.TextField', [], {}),
             'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
             'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
         },
-        'super_archives.mailinglistmembership': {
+        u'super_archives.mailinglistmembership': {
             'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
         },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
+        u'super_archives.message': {
+            'Meta': {'ordering': "('received_time',)", 'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
             'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
+            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
+            'received_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
+            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
+            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
+            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
+        },
+        u'super_archives.messageblock': {
+            'Meta': {'ordering': "('order',)", 'object_name': 'MessageBlock'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_reply': ('django.db.models.fields.BooleanField', [], {}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blocks'", 'to': u"orm['super_archives.Message']"}),
+            'order': ('django.db.models.fields.IntegerField', [], {}),
+            'text': ('django.db.models.fields.TextField', [], {})
         },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
+        u'super_archives.messagemetadata': {
+            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
             'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
             'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
             'value': ('django.db.models.fields.TextField', [], {})
         },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
+        u'super_archives.thread': {
+            'Meta': {'ordering': "('-latest_message__received_time',)", 'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
+            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
+            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
+            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
             'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
         },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
+        u'super_archives.vote': {
             'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
+            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
+            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
         }
     }
 
-    complete_apps = ['super_archives']
+    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0002_auto__add_field_userprofile_verification_hash.py b/src/super_archives/migrations/0002_auto__add_field_userprofile_verification_hash.py
deleted file mode 100644
index a47db14..0000000
--- a/src/super_archives/migrations/0002_auto__add_field_userprofile_verification_hash.py
+++ /dev/null
@@ -1,133 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'UserProfile.verification_hash'
-        db.add_column('super_archives_userprofile', 'verification_hash', self.gf('django.db.models.fields.CharField')(max_length=32, null=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'UserProfile.verification_hash'
-        db.delete_column('super_archives_userprofile', 'verification_hash')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0003_auto__add_field_thread_score.py b/src/super_archives/migrations/0003_auto__add_field_thread_score.py
deleted file mode 100644
index afb9069..0000000
--- a/src/super_archives/migrations/0003_auto__add_field_thread_score.py
+++ /dev/null
@@ -1,134 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Thread.score'
-        db.add_column('super_archives_thread', 'score', self.gf('django.db.models.fields.IntegerField')(default=0), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'Thread.score'
-        db.delete_column('super_archives_thread', 'score')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0004_auto__add_field_vote_created.py b/src/super_archives/migrations/0004_auto__add_field_vote_created.py
deleted file mode 100644
index 9be9e33..0000000
--- a/src/super_archives/migrations/0004_auto__add_field_vote_created.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Vote.created'
-        db.add_column('super_archives_vote', 'created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, default=datetime.datetime(2012, 1, 19, 18, 8, 46, 813949), blank=True), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'Vote.created'
-        db.delete_column('super_archives_vote', 'created')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0005_auto__add_field_message_spam__add_field_thread_spam.py b/src/super_archives/migrations/0005_auto__add_field_message_spam__add_field_thread_spam.py
deleted file mode 100644
index 1fd669d..0000000
--- a/src/super_archives/migrations/0005_auto__add_field_message_spam__add_field_thread_spam.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding field 'Message.spam'
-        db.add_column('super_archives_message', 'spam', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
-
-        # Adding field 'Thread.spam'
-        db.add_column('super_archives_thread', 'spam', self.gf('django.db.models.fields.BooleanField')(default=False), keep_default=False)
-
-
-    def backwards(self, orm):
-        
-        # Deleting field 'Message.spam'
-        db.delete_column('super_archives_message', 'spam')
-
-        # Deleting field 'Thread.spam'
-        db.delete_column('super_archives_thread', 'spam')
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0006_auto.py b/src/super_archives/migrations/0006_auto.py
deleted file mode 100644
index bfbad99..0000000
--- a/src/super_archives/migrations/0006_auto.py
+++ /dev/null
@@ -1,143 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding index on 'Message', fields ['subject_clean']
-        db.create_index('super_archives_message', ['subject_clean'])
-
-        # Adding index on 'Message', fields ['subject']
-        db.create_index('super_archives_message', ['subject'])
-
-
-    def backwards(self, orm):
-        
-        # Removing index on 'Message', fields ['subject']
-        db.delete_index('super_archives_message', ['subject'])
-
-        # Removing index on 'Message', fields ['subject_clean']
-        db.delete_index('super_archives_message', ['subject_clean'])
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0007_auto.py b/src/super_archives/migrations/0007_auto.py
deleted file mode 100644
index e8fedca..0000000
--- a/src/super_archives/migrations/0007_auto.py
+++ /dev/null
@@ -1,137 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding index on 'EmailAddress', fields ['real_name']
-        db.create_index('super_archives_emailaddress', ['real_name'])
-
-
-    def backwards(self, orm):
-        
-        # Removing index on 'EmailAddress', fields ['real_name']
-        db.delete_index('super_archives_emailaddress', ['real_name'])
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0008_add_mailinglist_name_to_url.py b/src/super_archives/migrations/0008_add_mailinglist_name_to_url.py
deleted file mode 100644
index a5193f4..0000000
--- a/src/super_archives/migrations/0008_add_mailinglist_name_to_url.py
+++ /dev/null
@@ -1,142 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import DataMigration
-from django.db import models
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        page_hits = orm.PageHit.objects.all()
-        for page_hit in page_hits:
-            if page_hit.url_path.startswith('/archives/thread/'):
-                token = page_hit.url_path.split('/')[-1]
-                threads = orm.Thread.objects.filter(subject_token=token)
-                if not len(threads): continue
-                thread = threads[0]
-                new_url = '/archives/thread/%s/%s' % (thread.mailinglist.name, 
-                                                      thread.subject_token)
-                page_hit.url_path = new_url
-                page_hit.save() 
-
-
-    def backwards(self, orm):
-        raise RuntimeError("Cannot reverse this migration.")
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0009_auto__del_field_message_mailinglist.py b/src/super_archives/migrations/0009_auto__del_field_message_mailinglist.py
deleted file mode 100644
index f68774e..0000000
--- a/src/super_archives/migrations/0009_auto__del_field_message_mailinglist.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Deleting field 'Message.mailinglist'
-        db.delete_column('super_archives_message', 'mailinglist_id')
-
-
-    def backwards(self, orm):
-        
-        # User chose to not deal with backwards NULL issues for 'Message.mailinglist'
-        raise RuntimeError("Cannot reverse this migration. 'Message.mailinglist' and its values cannot be restored.")
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0010_auto__add_unique_message_message_id_thread.py b/src/super_archives/migrations/0010_auto__add_unique_message_message_id_thread.py
deleted file mode 100644
index ef2efb4..0000000
--- a/src/super_archives/migrations/0010_auto__add_unique_message_message_id_thread.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# encoding: utf-8
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        
-        # Adding unique constraint on 'Message', fields ['message_id', 'thread']
-        db.create_unique('super_archives_message', ['message_id', 'thread_id'])
-
-
-    def backwards(self, orm):
-        
-        # Removing unique constraint on 'Message', fields ['message_id', 'thread']
-        db.delete_unique('super_archives_message', ['message_id', 'thread_id'])
-
-
-    models = {
-        'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        'auth.permission': {
-            'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': "orm['auth.User']"})
-        },
-        'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        },
-        'super_archives.message': {
-            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.EmailAddress']"}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Thread']", 'null': 'True'})
-        },
-        'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': "orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256'})
-        },
-        'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
diff --git a/src/super_archives/migrations/0011_auto__chg_field_userprofile_webpage.py b/src/super_archives/migrations/0011_auto__chg_field_userprofile_webpage.py
deleted file mode 100644
index 76c57d6..0000000
--- a/src/super_archives/migrations/0011_auto__chg_field_userprofile_webpage.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Changing field 'UserProfile.webpage'
-        db.alter_column(u'super_archives_userprofile', 'webpage', self.gf('django.db.models.fields.CharField')(max_length=256, null=True))
-
-    def backwards(self, orm):
-
-        # User chose to not deal with backwards NULL issues for 'UserProfile.webpage'
-        raise RuntimeError("Cannot reverse this migration. 'UserProfile.webpage' and its values cannot be restored.")
-
-    models = {
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'auth.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': u"orm['auth.User']"})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.userprofile': {
-            'Meta': {'object_name': 'UserProfile'},
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user': ('django.db.models.fields.related.OneToOneField', [], {'to': u"orm['auth.User']", 'unique': 'True'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0012_auto__del_userprofile__chg_field_vote_user__chg_field_emailaddress_use.py b/src/super_archives/migrations/0012_auto__del_userprofile__chg_field_vote_user__chg_field_emailaddress_use.py
deleted file mode 100644
index 4ae89cd..0000000
--- a/src/super_archives/migrations/0012_auto__del_userprofile__chg_field_vote_user__chg_field_emailaddress_use.py
+++ /dev/null
@@ -1,159 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting model 'UserProfile'
-        db.delete_table(u'super_archives_userprofile')
-
-
-        # Changing field 'Vote.user'
-        db.alter_column(u'super_archives_vote', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['accounts.User']))
-
-        # Changing field 'EmailAddress.user'
-        db.alter_column(u'super_archives_emailaddress', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['accounts.User']))
-
-        # Changing field 'MailingListMembership.user'
-        db.alter_column(u'super_archives_mailinglistmembership', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['accounts.User']))
-
-    def backwards(self, orm):
-        # Adding model 'UserProfile'
-        db.create_table(u'super_archives_userprofile', (
-            ('google_talk', self.gf('django.db.models.fields.EmailField')(max_length=75, null=True)),
-            ('facebook', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
-            ('user', self.gf('django.db.models.fields.related.OneToOneField')(to=orm['auth.User'], unique=True)),
-            ('webpage', self.gf('django.db.models.fields.CharField')(max_length=256, null=True)),
-            ('role', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
-            ('twitter', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
-            ('verification_hash', self.gf('django.db.models.fields.CharField')(max_length=32, null=True)),
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('institution', self.gf('django.db.models.fields.CharField')(max_length=128, null=True)),
-        ))
-        db.send_create_signal(u'super_archives', ['UserProfile'])
-
-
-        # Changing field 'Vote.user'
-        db.alter_column(u'super_archives_vote', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User']))
-
-        # Changing field 'EmailAddress.user'
-        db.alter_column(u'super_archives_emailaddress', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['auth.User']))
-
-        # Changing field 'MailingListMembership.user'
-        db.alter_column(u'super_archives_mailinglistmembership', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['auth.User']))
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0013_auto__add_emailaddressvalidation.py b/src/super_archives/migrations/0013_auto__add_emailaddressvalidation.py
deleted file mode 100644
index 134b67b..0000000
--- a/src/super_archives/migrations/0013_auto__add_emailaddressvalidation.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'EmailAddressValidation'
-        db.create_table(u'super_archives_emailaddressvalidation', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('address', self.gf('django.db.models.fields.EmailField')(unique=True, max_length=75)),
-            ('user', self.gf('django.db.models.fields.related.ForeignKey')(related_name='emails_not_validated', null=True, to=orm['accounts.User'])),
-            ('validation_key', self.gf('django.db.models.fields.CharField')(default='2a261e5a2f944d36b252629b1a108e7b', max_length=32)),
-            ('created', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-        ))
-        db.send_create_signal(u'super_archives', ['EmailAddressValidation'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'EmailAddressValidation'
-        db.delete_table(u'super_archives_emailaddressvalidation')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'0dd1ae4b49bc43ff904c1cfa3b2e6ef6'", 'max_length': '32'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0014_auto__chg_field_emailaddressvalidation_validation_key.py b/src/super_archives/migrations/0014_auto__chg_field_emailaddressvalidation_validation_key.py
deleted file mode 100644
index f5e2671..0000000
--- a/src/super_archives/migrations/0014_auto__chg_field_emailaddressvalidation_validation_key.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Changing field 'EmailAddressValidation.validation_key'
-        db.alter_column(u'super_archives_emailaddressvalidation', 'validation_key', self.gf('django.db.models.fields.CharField')(max_length=32, null=True))
-
-    def backwards(self, orm):
-
-        # Changing field 'EmailAddressValidation.validation_key'
-        db.alter_column(u'super_archives_emailaddressvalidation', 'validation_key', self.gf('django.db.models.fields.CharField')(max_length=32))
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'30a2065c72c1402986a11e7c5369f5a5'", 'max_length': '32', 'null': 'True'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0015_auto__chg_field_emailaddress_user.py b/src/super_archives/migrations/0015_auto__chg_field_emailaddress_user.py
deleted file mode 100644
index 4b7cc56..0000000
--- a/src/super_archives/migrations/0015_auto__chg_field_emailaddress_user.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-
-        # Changing field 'EmailAddress.user'
-        db.alter_column(u'super_archives_emailaddress', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, on_delete=models.SET_NULL, to=orm['accounts.User']))
-
-    def backwards(self, orm):
-
-        # Changing field 'EmailAddress.user'
-        db.alter_column(u'super_archives_emailaddress', 'user_id', self.gf('django.db.models.fields.related.ForeignKey')(null=True, to=orm['accounts.User']))
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'a9cfbe23d1be41e4beeafa7790325e26'", 'max_length': '32', 'null': 'True'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0016_auto__add_unique_emailaddressvalidation_user_address.py b/src/super_archives/migrations/0016_auto__add_unique_emailaddressvalidation_user_address.py
deleted file mode 100644
index b03f41c..0000000
--- a/src/super_archives/migrations/0016_auto__add_unique_emailaddressvalidation_user_address.py
+++ /dev/null
@@ -1,138 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding unique constraint on 'EmailAddressValidation', fields ['user', 'address']
-        db.create_unique(u'super_archives_emailaddressvalidation', ['user_id', 'address'])
-
-
-    def backwards(self, orm):
-        # Removing unique constraint on 'EmailAddressValidation', fields ['user', 'address']
-        db.delete_unique(u'super_archives_emailaddressvalidation', ['user_id', 'address'])
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'cfda46852e7e4e4a9e34a57c3d3b2330'", 'max_length': '32', 'null': 'True'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0017_auto__add_keyword.py b/src/super_archives/migrations/0017_auto__add_keyword.py
deleted file mode 100644
index 29aeebb..0000000
--- a/src/super_archives/migrations/0017_auto__add_keyword.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Keyword'
-        db.create_table(u'super_archives_keyword', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('keyword', self.gf('django.db.models.fields.CharField')(max_length='128')),
-            ('weight', self.gf('django.db.models.fields.IntegerField')(default=0)),
-            ('thread', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['super_archives.Thread'])),
-        ))
-        db.send_create_signal(u'super_archives', ['Keyword'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'Keyword'
-        db.delete_table(u'super_archives_keyword')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'e2d18f1f8d6445fc91c04d17acdbe23a'", 'max_length': '32', 'null': 'True'})
-        },
-        u'super_archives.keyword': {
-            'Meta': {'object_name': 'Keyword'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keyword': ('django.db.models.fields.CharField', [], {'max_length': "'128'"}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']"}),
-            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'ordering': "('received_time',)", 'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0018_auto__add_index_message_received_time.py b/src/super_archives/migrations/0018_auto__add_index_message_received_time.py
deleted file mode 100644
index 63dd7cd..0000000
--- a/src/super_archives/migrations/0018_auto__add_index_message_received_time.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding index on 'Message', fields ['received_time']
-        db.create_index(u'super_archives_message', ['received_time'])
-
-
-    def backwards(self, orm):
-        # Removing index on 'Message', fields ['received_time']
-        db.delete_index(u'super_archives_message', ['received_time'])
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'1775e2bdc5e341a9b9b8a6346eec1024'", 'max_length': '32', 'null': 'True'})
-        },
-        u'super_archives.keyword': {
-            'Meta': {'ordering': "('?',)", 'object_name': 'Keyword'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keyword': ('django.db.models.fields.CharField', [], {'max_length': "'128'"}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']"}),
-            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'ordering': "('received_time',)", 'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0019_auto__add_messageblock.py b/src/super_archives/migrations/0019_auto__add_messageblock.py
deleted file mode 100644
index 1e611d3..0000000
--- a/src/super_archives/migrations/0019_auto__add_messageblock.py
+++ /dev/null
@@ -1,160 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'MessageBlock'
-        db.create_table(u'super_archives_messageblock', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('message', self.gf('django.db.models.fields.related.ForeignKey')(related_name='blocks', to=orm['super_archives.Message'])),
-            ('text', self.gf('django.db.models.fields.TextField')()),
-            ('is_reply', self.gf('django.db.models.fields.BooleanField')()),
-            ('order', self.gf('django.db.models.fields.IntegerField')()),
-        ))
-        db.send_create_signal(u'super_archives', ['MessageBlock'])
-
-
-    def backwards(self, orm):
-        # Deleting model 'MessageBlock'
-        db.delete_table(u'super_archives_messageblock')
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'f7c4c15797f34834bf5a8b9bd84fabee'", 'max_length': '32', 'null': 'True'})
-        },
-        u'super_archives.keyword': {
-            'Meta': {'ordering': "('?',)", 'object_name': 'Keyword'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keyword': ('django.db.models.fields.CharField', [], {'max_length': "'128'"}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']"}),
-            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'ordering': "('received_time',)", 'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messageblock': {
-            'Meta': {'ordering': "('order',)", 'object_name': 'MessageBlock'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_reply': ('django.db.models.fields.BooleanField', [], {}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blocks'", 'to': u"orm['super_archives.Message']"}),
-            'order': ('django.db.models.fields.IntegerField', [], {}),
-            'text': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
diff --git a/src/super_archives/migrations/0020_pagehit_to_hitcounter.py b/src/super_archives/migrations/0020_pagehit_to_hitcounter.py
deleted file mode 100644
index 6815c8d..0000000
--- a/src/super_archives/migrations/0020_pagehit_to_hitcounter.py
+++ /dev/null
@@ -1,190 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import datetime
-
-from south.db import db
-from south.logger import _logger
-from south.v2 import DataMigration
-from django.core.urlresolvers import resolve
-from django.db import models
-
-
-class Migration(DataMigration):
-
-    def forwards(self, orm):
-        """Migrate all data from the PageHit model to the given object with
-        the HitCounterMixin."""
-
-        content_type = orm['contenttypes.ContentType'].objects.get(
-            model='thread',
-            app_label='super_archives'
-        )
-
-        for obj in orm.PageHit.objects.all():
-            view = resolve(obj.url_path)
-
-            try:
-                thread = orm.Thread.objects.get(
-                    subject_token=view.kwargs.get('thread_token'),
-                    mailinglist__name=view.kwargs.get('mailinglist'),
-                )
-            except orm.Thread.DoesNotExist:
-                continue
-
-            hit_obj, created = orm['hitcounter.Hit'].objects.get_or_create(
-                content_type=content_type,
-                object_pk=thread.pk,
-                defaults={'hits': obj.hit_count},
-            )
-
-            if not created:
-                hit_obj.hits = obj.hit_count
-                hit_obj.save()
-
-    def backwards(self, orm):
-        _logger.warning(u"This backwards don't get the data of PageHit back.")
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'hitcounter.hit': {
-            'Meta': {'unique_together': "(('content_type', 'object_pk'),)", 'object_name': 'Hit'},
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            'created': ('django.db.models.fields.DateField', [], {'auto_now_add': 'True', 'db_index': 'True', 'blank': 'True'}),
-            'hits': ('django.db.models.fields.PositiveIntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'object_pk': ('django.db.models.fields.CharField', [], {'max_length': '256'}),
-            'updated': ('django.db.models.fields.DateField', [], {'auto_now': 'True', 'db_index': 'True', 'blank': 'True'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'60d2bcbd9d924d9f8139c2d1227223ed'", 'max_length': '32', 'null': 'True'})
-        },
-        u'super_archives.keyword': {
-            'Meta': {'ordering': "('?',)", 'object_name': 'Keyword'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keyword': ('django.db.models.fields.CharField', [], {'max_length': "'128'"}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']"}),
-            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'ordering': "('received_time',)", 'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messageblock': {
-            'Meta': {'ordering': "('order',)", 'object_name': 'MessageBlock'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_reply': ('django.db.models.fields.BooleanField', [], {}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blocks'", 'to': u"orm['super_archives.Message']"}),
-            'order': ('django.db.models.fields.IntegerField', [], {}),
-            'text': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.pagehit': {
-            'Meta': {'object_name': 'PageHit'},
-            'hit_count': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'url_path': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['hitcounter', 'super_archives']
-    symmetrical = True
diff --git a/src/super_archives/migrations/0021_auto__del_pagehit.py b/src/super_archives/migrations/0021_auto__del_pagehit.py
deleted file mode 100644
index b09aea4..0000000
--- a/src/super_archives/migrations/0021_auto__del_pagehit.py
+++ /dev/null
@@ -1,152 +0,0 @@
-# -*- coding: utf-8 -*-
-import datetime
-from south.db import db
-from south.v2 import SchemaMigration
-from django.db import models
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Deleting model 'PageHit'
-        db.delete_table(u'super_archives_pagehit')
-
-
-    def backwards(self, orm):
-        # Adding model 'PageHit'
-        db.create_table(u'super_archives_pagehit', (
-            (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('hit_count', self.gf('django.db.models.fields.IntegerField')(default=0)),
-            ('url_path', self.gf('django.db.models.fields.CharField')(max_length=2048, unique=True, db_index=True)),
-        ))
-        db.send_create_signal(u'super_archives', ['PageHit'])
-
-
-    models = {
-        u'accounts.user': {
-            'Meta': {'object_name': 'User'},
-            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'email': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75', 'blank': 'True'}),
-            'facebook': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'google_talk': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}),
-            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'institution': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
-            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
-            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
-            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
-            'role': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'twitter': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}),
-            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}),
-            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}),
-            'verification_hash': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True', 'blank': 'True'}),
-            'webpage': ('django.db.models.fields.CharField', [], {'max_length': '256', 'null': 'True', 'blank': 'True'})
-        },
-        u'auth.group': {
-            'Meta': {'object_name': 'Group'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
-            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
-        },
-        u'auth.permission': {
-            'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
-            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
-        },
-        u'contenttypes.contenttype': {
-            'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
-            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
-        },
-        u'super_archives.emailaddress': {
-            'Meta': {'ordering': "('id',)", 'object_name': 'EmailAddress'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'md5': ('django.db.models.fields.CharField', [], {'max_length': '32', 'null': 'True'}),
-            'real_name': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '64', 'blank': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails'", 'null': 'True', 'on_delete': 'models.SET_NULL', 'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.emailaddressvalidation': {
-            'Meta': {'unique_together': "(('user', 'address'),)", 'object_name': 'EmailAddressValidation'},
-            'address': ('django.db.models.fields.EmailField', [], {'unique': 'True', 'max_length': '75'}),
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'emails_not_validated'", 'null': 'True', 'to': u"orm['accounts.User']"}),
-            'validation_key': ('django.db.models.fields.CharField', [], {'default': "'dabb0135cf6c436da11caf5dac7e8c10'", 'max_length': '32', 'null': 'True'})
-        },
-        u'super_archives.keyword': {
-            'Meta': {'ordering': "('?',)", 'object_name': 'Keyword'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'keyword': ('django.db.models.fields.CharField', [], {'max_length': "'128'"}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']"}),
-            'weight': ('django.db.models.fields.IntegerField', [], {'default': '0'})
-        },
-        u'super_archives.mailinglist': {
-            'Meta': {'object_name': 'MailingList'},
-            'description': ('django.db.models.fields.TextField', [], {}),
-            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'last_imported_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'logo': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '80'})
-        },
-        u'super_archives.mailinglistmembership': {
-            'Meta': {'object_name': 'MailingListMembership'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        },
-        u'super_archives.message': {
-            'Meta': {'ordering': "('received_time',)", 'unique_together': "(('thread', 'message_id'),)", 'object_name': 'Message'},
-            'body': ('django.db.models.fields.TextField', [], {'default': "''"}),
-            'from_address': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.EmailAddress']"}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message_id': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'received_time': ('django.db.models.fields.DateTimeField', [], {'db_index': 'True'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'subject_clean': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}),
-            'thread': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Thread']", 'null': 'True'})
-        },
-        u'super_archives.messageblock': {
-            'Meta': {'ordering': "('order',)", 'object_name': 'MessageBlock'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'is_reply': ('django.db.models.fields.BooleanField', [], {}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'blocks'", 'to': u"orm['super_archives.Message']"}),
-            'order': ('django.db.models.fields.IntegerField', [], {}),
-            'text': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.messagemetadata': {
-            'Message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'Meta': {'object_name': 'MessageMetadata'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '512'}),
-            'value': ('django.db.models.fields.TextField', [], {})
-        },
-        u'super_archives.thread': {
-            'Meta': {'unique_together': "(('subject_token', 'mailinglist'),)", 'object_name': 'Thread'},
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'latest_message': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'+'", 'unique': 'True', 'null': 'True', 'to': u"orm['super_archives.Message']"}),
-            'mailinglist': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.MailingList']"}),
-            'score': ('django.db.models.fields.IntegerField', [], {'default': '0'}),
-            'spam': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
-            'subject_token': ('django.db.models.fields.CharField', [], {'max_length': '512'})
-        },
-        u'super_archives.vote': {
-            'Meta': {'unique_together': "(('user', 'message'),)", 'object_name': 'Vote'},
-            'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'message': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['super_archives.Message']"}),
-            'user': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['accounts.User']"})
-        }
-    }
-
-    complete_apps = ['super_archives']
\ No newline at end of file
--
libgit2 0.21.2