Fixed updating of user
Merge branch 'master' of github.com:SwampCo/motherlode