Testing...Please ignore -MM
Merge branch 'master' of github.com:maybury/smackchat