changed ruby version to 2.1

Travis started having build errors with Ruby 2.1.0, the solution (as per Twitter/Github is to change the Ruby version to 2.1)

- https://twitter.com/travisci/status/461447293976055808
- https://github.com/travis-ci/travis-ci/issues/2220
Merge branch 'develop'