Added rvm files
Merge branch 'master' into javascript-refactor