Can't use return in rake task, use conditional instead
Update .rvmrc

Got an okay from Jeff and Matt to change this