Merge pull request #1 from jamesbornholt/master

more people to mention
Merge pull request #2 from jamesbornholt/master

better word list