Fixes #247.  Adds proper tax_query object on pre_get_posts.  Props @benhusion for initial patch