Updated to spree 2-2-stable branch which is current at 2.2.2.beta