Refactor category filter to utilize category collection

Fix issue where some categories would display when the customer does not
have permission to see them
Merge branch 'master' of https://github.com/ijandrs/magento-MagSolr