Spree 1 3 adjustment fixes

Pulling in adjustments changes from master and making some tweaks to work with 1.3