rvm to ruby-version
merge leshill/master
merge amd branch