Updated everything to use UserInfo instead of User
Merge pull request #46 from taylorsw/master

Updated everything to use UserInfo instead of User