Update to gemspec and Gemfile to avoid spree conflicts