Merge pull request #39 from 200Creative/master

taxonomies fix still not merged
Merge branch '2-2-stable' of https://github.com/200Creative/spree_bootstrap_frontend into 2-2-stable
Cherry-pick remove unsupported with_shipping_method
Merge pull request #47 from paul-at/without-shipping-method

remove unsupported with_shipping_method in master