remove rvmrc from gitigrore and add .rvmrc to repo
Merge remote-tracking branch 'origin/master'