Updating the master to be in sync with spree/spree master

There have been some refactorings that affect this extension