Merge branch 'master' of github.com:mikeyhc/harkerirc