Remove unfunny words, add more funny ones

Includes some new "next" options