Bump ruby version to 2.1
Merge branch 'bump-ruby'