Removed unnecessary rvm directives from .travis.yml
Merge branch 'dev'