move to .ruby-* files for rvm
Merge remote-tracking branch 'origin/master'