Removed special token that signified no thesaurus is being used.

Replaced with None
Fixed bug where chi2 feature selection would run even when disabled