rvmrc to ruby-version
Merge remote-tracking branch 'origin/source' into source