Merge pull request #252 from cmurphy/master
Update .travis.yml, Gemfile, Rakefile, and CONTRIBUTING.md