Update user model
A bunch of stuff
Merge branch 'master' of github.com:mattmarcello/tmto_text