updated to use spree 2.1.*