Push to v1.7

Several little bugfixes, added a more comfortable way of controlling
global messages from within other channels, fixed the censorship part