updating queries for user model change
db queries tested new user model
Merge pull request #20 from dimagi/user-model-refactor

User model refactor