Make this into one group instead of multiple groups

[coltonw]

Reasons for this:

• In order to make this into a more reasonable one person project
• In order to remove some confusion around users in multiple groups or groups that start to overlap so much they should merge and group management in general that may have no good solution in the old architecture.
• Also alleviates need for Add some sort of group type #8