Broken tests so I can pull
Merge branch 'master' of github.com:andres-erbsen/chatterbox
Merge