fixing ordering around rvm/rvmrc
syntax cleanup and minor class renaming