Restore fields to user model, and move forms to forms.py
Update for use with nonsense server
Remove admin from test app