Conversion from PircBotX to PircBot, much cleaner.
Merge remote-tracking branch 'origin/master'