gbb stuff
Merge branch 'master' of https://github.com/ctk3b/groupy

Conflicts:
	groupy/gbb.py
merge