rbenv prompt refinement
Merge remote-tracking branch 'origin/master' into ccap