Merge pull request #673 from Arantor/release-2.1

! Clean up some of the stuff surrounding word censoring; there's no need...
Merge pull request #674 from Arantor/release-2.1

! For some reason, some of the fixes that were in 2.0.5 weren't pushed t...