minor changes
Merge branch 'master' of https://github.com/esoergel/peacecorps into develop
updated user models