Update to support Spree 2.2-stable
Whitespace cleanup