Cleanup and simplify roles. This shouldn't cause any changes on the servers.
Merge pull request #152 from dwradcliffe/simplify-roles

Cleanup and simplify roles