Simplified the grammar, and made it more consistent

The keyword 'roles' inside User, and the keyword 'permissions' inside
Role, were not necessary, and inconsistent with the rest of the
assignments and references in the grammar. Tests updated accordingly