Switch travis to ruby 2.1, next try
Merge pull request #894 from opf/feature/travis_ruby_21

Switch travis to ruby 2.1, next try