Chat working again
Pull in cleanup changes
Merge branch 'master' of github.com:whenther/webtalk