Merge organization logic into groups

[ross]

There seems little point in keeping groups and organizations separate. We should merge whatever we actually need from orgs into the group model and use that as default (regardless of which security option has been set up).

Might also be cool if we could remove the need for membership and instead use FKs?