adding in some other comedy options
Merge branch 'master' of github.com:tansaku/twss