diff --git a/.pep8 b/.pep8
new file mode 100644
index 00000000..f8931cdd
--- /dev/null
+++ b/.pep8
@@ -0,0 +1,2 @@
+[pep8]
+exclude=problem_builder/migrations
diff --git a/problem_builder/migrations/0001_initial.py b/problem_builder/migrations/0001_initial.py
index 579aae31..2b3f6085 100644
--- a/problem_builder/migrations/0001_initial.py
+++ b/problem_builder/migrations/0001_initial.py
@@ -1,44 +1,29 @@
 # -*- coding: utf-8 -*-
-from south.db import db
-from south.v2 import SchemaMigration
-
-
-class Migration(SchemaMigration):
-
-    def forwards(self, orm):
-        # Adding model 'Answer'
-        db.create_table('problem_builder_answer', (
-            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
-            ('name', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),
-            ('student_id', self.gf('django.db.models.fields.CharField')(max_length=32, db_index=True)),
-            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),
-            ('student_input', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
-            ('created_on', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
-            ('modified_on', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
-        ))
-        db.send_create_signal('problem_builder', ['Answer'])
-
-        # Adding unique constraint on 'Answer', fields ['student_id', 'course_id', 'name']
-        db.create_unique('problem_builder_answer', ['student_id', 'course_id', 'name'])
-
-    def backwards(self, orm):
-        # Removing unique constraint on 'Answer', fields ['student_id', 'course_id', 'name']
-        db.delete_unique('problem_builder_answer', ['student_id', 'course_id', 'name'])
-
-        # Deleting model 'Answer'
-        db.delete_table('problem_builder_answer')
-
-    models = {
-        'problem_builder.answer': {
-            'Meta': {'unique_together': "(('student_id', 'course_id', 'name'),)", 'object_name': 'Answer'},
-            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
-            'modified_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
-            'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
-            'student_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
-            'student_input': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'})
-        }
-    }
-
-    complete_apps = ['problem_builder']
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Answer',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=50, db_index=True)),
+                ('student_id', models.CharField(max_length=32, db_index=True)),
+                ('course_id', models.CharField(max_length=50, db_index=True)),
+                ('student_input', models.TextField(default=b'', blank=True)),
+                ('created_on', models.DateTimeField(auto_now_add=True, verbose_name=b'created on')),
+                ('modified_on', models.DateTimeField(auto_now=True, verbose_name=b'modified on')),
+            ],
+        ),
+        migrations.AlterUniqueTogether(
+            name='answer',
+            unique_together=set([('student_id', 'course_id', 'name')]),
+        ),
+    ]
diff --git a/problem_builder/migrations/0002_auto_20160121_1525.py b/problem_builder/migrations/0002_auto_20160121_1525.py
new file mode 100644
index 00000000..65c7e0ed
--- /dev/null
+++ b/problem_builder/migrations/0002_auto_20160121_1525.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('problem_builder', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Share',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('submission_uid', models.CharField(max_length=32)),
+                ('block_id', models.CharField(max_length=255, db_index=True)),
+                ('notified', models.BooleanField(default=False, db_index=True)),
+                ('shared_by', models.ForeignKey(related_name='problem_builder_shared_by', to=settings.AUTH_USER_MODEL)),
+                ('shared_with', models.ForeignKey(related_name='problem_builder_shared_with', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AlterUniqueTogether(
+            name='share',
+            unique_together=set([('shared_by', 'shared_with', 'block_id')]),
+        ),
+    ]
diff --git a/problem_builder/south_migrations/0001_initial.py b/problem_builder/south_migrations/0001_initial.py
new file mode 100644
index 00000000..579aae31
--- /dev/null
+++ b/problem_builder/south_migrations/0001_initial.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+from south.db import db
+from south.v2 import SchemaMigration
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding model 'Answer'
+        db.create_table('problem_builder_answer', (
+            ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+            ('name', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),
+            ('student_id', self.gf('django.db.models.fields.CharField')(max_length=32, db_index=True)),
+            ('course_id', self.gf('django.db.models.fields.CharField')(max_length=50, db_index=True)),
+            ('student_input', self.gf('django.db.models.fields.TextField')(default='', blank=True)),
+            ('created_on', self.gf('django.db.models.fields.DateTimeField')(auto_now_add=True, blank=True)),
+            ('modified_on', self.gf('django.db.models.fields.DateTimeField')(auto_now=True, blank=True)),
+        ))
+        db.send_create_signal('problem_builder', ['Answer'])
+
+        # Adding unique constraint on 'Answer', fields ['student_id', 'course_id', 'name']
+        db.create_unique('problem_builder_answer', ['student_id', 'course_id', 'name'])
+
+    def backwards(self, orm):
+        # Removing unique constraint on 'Answer', fields ['student_id', 'course_id', 'name']
+        db.delete_unique('problem_builder_answer', ['student_id', 'course_id', 'name'])
+
+        # Deleting model 'Answer'
+        db.delete_table('problem_builder_answer')
+
+    models = {
+        'problem_builder.answer': {
+            'Meta': {'unique_together': "(('student_id', 'course_id', 'name'),)", 'object_name': 'Answer'},
+            'course_id': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'created_on': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'modified_on': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50', 'db_index': 'True'}),
+            'student_id': ('django.db.models.fields.CharField', [], {'max_length': '32', 'db_index': 'True'}),
+            'student_input': ('django.db.models.fields.TextField', [], {'default': "''", 'blank': 'True'})
+        }
+    }
+
+    complete_apps = ['problem_builder']
diff --git a/problem_builder/migrations/0002_copy_from_mentoring.py b/problem_builder/south_migrations/0002_copy_from_mentoring.py
similarity index 100%
rename from problem_builder/migrations/0002_copy_from_mentoring.py
rename to problem_builder/south_migrations/0002_copy_from_mentoring.py
diff --git a/problem_builder/migrations/0003_auto__add_share__add_unique_share_shared_by_shared_with_block_id.py b/problem_builder/south_migrations/0003_auto__add_share__add_unique_share_shared_by_shared_with_block_id.py
similarity index 100%
rename from problem_builder/migrations/0003_auto__add_share__add_unique_share_shared_by_shared_with_block_id.py
rename to problem_builder/south_migrations/0003_auto__add_share__add_unique_share_shared_by_shared_with_block_id.py
diff --git a/problem_builder/south_migrations/__init__.py b/problem_builder/south_migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/pylintrc b/pylintrc
index 29296376..539afab9 100644
--- a/pylintrc
+++ b/pylintrc
@@ -1,6 +1,8 @@
+[MASTER]
+ignore=problem_builder/migrations
+
 [REPORTS]
 reports=no
-include-ids=yes
 
 [FORMAT]
 max-line-length=120
diff --git a/requirements.txt b/requirements.txt
index ce2cb574..dcd4747f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 ddt
 mock
 unicodecsv==0.9.4
--e git+https://github.com/edx/xblock-utils.git@b4f9b51146c7fafa12f41d54af752b8f1516dffd#egg=xblock-utils
+-e git+https://github.com/edx/xblock-utils.git@v1.0.2#egg=xblock-utils
 -e .