Tidy up
Merge branch 'master' of github.com:buddycloud/buddycloud-xep