Added include list to categoryFilter

You can now specify an include list as well as exclude list, but
the exclude list is a higher priority in the case that it matches
both the include and exclude lists.