Update to match spree 2.1/rails 4