Update to support Spree 2.2-stable
Whitespace cleanup
Merge pull request #1 from boombotix/chore/spree_2.2-stable

[CHORE] Update to support Spree 2.2-stable