Clean up the distinction between the standard 'subscribe', 'publish' contact list channels and arbitrary group channels.
Clean up the distinction between the standard 'subscribe', 'publish' contact list channels and arbitrary group channels.

GNOME/folks,renatofilho/folks,renatofilho/folks,renatofilho/folks2,renatofilho/folks2,renatofilho/folks,pwithnall/folks,pwithnall/folks,renatofilho/folks,GNOME/folks,pwithnall/folks,GNOME/folks,renatofilho/folks2,renatofilho/folks2