support spree master and 2-2-stable change in structure

and also get it to work with the assets pipeline