Migration created by "./manage.py schemamigration --auto mapit"

I'm not really sure how the migrations have gotten out of sync. This may require a bit more investigating before merging and deploying.