Make regex better for haha
Merge branch 'master' of https://github.com/jhoff/HedonismBot