Fixes issue w/ ember reading users first/last name
Merge branch 'master' of github.com:Gowiem/Sisyphus