Better syntax for queries
Merge branch '2-1-stable' of github.com:j27lee/spree_wishlist into 2-1-stable