s/plugin/feature/g
Merge remote branch 'upstream/master'
Merge pull request #8 from tonybaldwin/master

IRC configs fixed