Remove vagrant and a couple of quick rvm fixes