fix schema
Merge branch 'do_not_push' into 3_3_0_hotfixes
repair nicknames migration so migrate can succeed
Merge pull request #652 from YaleSTC/3_3_0_hotfixes_pre_schema_nickname

3 3 0 hotfixes pre schema nickname