Merge pull request #295 from buddycloud/dev-candy

Fix tests
Update README.bubbling.md
Update README.bubbling.md
trying to make this clearer
Merge branch 'master' of https://github.com/buddycloud/webclient into dev-candy
Merge with master