Cleanup of user model.
Merge branch 'master' of github.com:tylermercier/moody_friends