Updates for rails 4/Spree 2.2 compatibility