Minor changes

* Add service incidator reason code (request of Riley)
* Change format of term in courseselect tab (request of Dave T)
Refactor Users to more clearly separate roles, permissions, and preferences.
Refactor Users to more clearly separate roles.

Also cleaned up a couple of misc. messages.
Merge branch 'Refactor-Users' into dev