added spree 2.1, rails 4 compatability