Port to Spree 2.0.0.beta

Not sure what the appropriate base branch is for this Eric since it was based off my "fixups" branch. Might be worth creating a new branch or putting it on master. Let me know and I will resend to master branch if you want to go that way.