add .rvmrc
remove to ruby-version
fix ruby-version
Merge branch 'staging_rvm' into develop