Sqaush migrations

All right. So merge this, then run

./manage.py migrate kingdom internal --fake --delete-ghost-migrations
No migrations for tests