rvm prompt refinement
Merge branch 'master' into ccap