Update to Spree 2.2. Fix specs. Tidy up.