Switch over to the new Mashable API
Fixed the display of guild names
Merge branch 'master' into subs

Conflicts:
	grouploader.py
Fix a couple more issues with subs support