Edit user API functions & model
Merge branch 'master' of https://github.com/jketcham/habuwi