Fixes made working with account creation scripts
Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Updated migrations and admin/settings code to fix some bugs when upgrading to custom user model