Roles updates

Roles, now with looser regex matching, code reuse.
We can probably trust users to spot any dupes for the relatively small # of roles/people we are dealing with at the moment.