Merge pull request #31 from futhr/to-upstream

Updates for spree 2.0.0