Add rvm on OSX
Merge in rvm