Remove sourcing rvm explicitly, use a conditional