updated user stuff
Merge pull request #6 from bobolinks-2014/cjryan28

updated user stuff