Use travis-recommended rbx Gemfile config
Add ruby 2.1.1 to travis config
Merge branch 'update-travis-config'