rename user roles to just roles
Merge pull request #24 from marwoodandrew/master

rename user roles to just roles