ruby RPS1 prompt was a bit long
24 characters for cwd was too much
Merge branch 'master' into ccap