Modified User class, so it can properly serialize in JSON
Merge branch 'master' of https://github.com/maltron/saruman