Minimal changes to regain compatibility with master branch of goirc.
Merge branch 'master' of github.com:fluffle/sp0rkle