Merge branch master of https://github.com/rabbitircd/rabbitircd to https://github.com/dboyz/rabbitircd