Fixed joining channels - finally!
Merge branch 'testing' of github.com:svkampen/James into testing