Incorporated haystack ShipIt improvements

Used David improvements for faceted search and facet removal.