Add Django 1.7 migrations
Merge branch 'migrations' into hotfix