Port to 1-3-stable

This is lightly tested and I am new to Spree and Rails, so feedback welcome as to other approach.