Moved shims into buildout, updated gs.groups