Merge pull request #135 from iceglow/cleanup

Corrected some violations.
Upgraded the role-access-manager plugin