Switch to new rvm file style