Add support for ## channels, as used by freenode
Merged
Merged