merge upstream haystack (my haystack patch for faceting is no longer needed, and at the moment I'm dropping my prune_index mgmt command)
remove Care2 TAP from the advertising page's explanation
correct feed names on the weird feed pages we have