Put required dependencies in the gemspec and optional stuff in the Gemfile
Merge remote-tracking branch 'upstream/master'
Remove Gemfile.lock