Don't allow users to join channels they are already in
Merge branch '2.0' into ircu