Add Readme
Update versions
Add Ruby 2.1.0 to Gemfile
Resolve merge conflicts