Use group_by for collecting the whip orgs

Note: this change means that whip orgs without any roles will not be
displayed.