Made cbot channel aware
Merge branch 'master' of github.com:larsivsi/cbot