Updating to Spree 2.1.4
Merge branch 'master' of github.com:watg/spree_chimpy into 2-1-stable