Move things around a little
Remove everything!
Merge branch 'master' of github.com:buddycloud/buddycloud-xep into gh-pages
Merge branch 'gh-pages' of github.com:buddycloud/buddycloud-xep into gh-pages

Conflicts:
	buddycloud.html
	buddycloud.xml