Categories were still sometimes being set even when the option was disabled.
Merge pull request #95 from MordredKLB/master

Categories were still sometimes being set even when the option was disab...