Properly hydrate users.
Merge branch 'master' of github.com:corinna000/feedthehack