fixing merge issues
Merge pull request #221 from buddycloud/master

Merge everything into master