Updating to Spree 2.1.4
Change #total_tax method name to just #tax
Merge branch '2-1-stable' of github.com:watg/spree_chimpy

Conflicts:
	lib/spree/chimpy/interface/orders.rb