Updated files for proper rvm support