remove rvmrc and change to .ruby-version
merge with master