Part 1 of 2 of stabilizing rvm builds