Speed up Groups feature
Merge pull request #557 from sethvargo/faster_groups

Speed up Groups feature