Undefer columns to reduce number of queries for UserRoles
Minor cleanups
Merge pull request #306 from reciprocity/feature/userrole-context-optimizations

Optimize queries for permissions and users; minor cleanup