Update to use hybridgroup gems instead of personal forks