fixes from user model refactor testing
Merge pull request #16 from dimagi/user_model_refactor

fixes from user model refactor testing