Tweaked migrations to play nice with custom user model