use new rvm files, upgrade deps