changes for rails 4, ruby 2, spree 2.1