Merge branch 'rr/zsh-color-prompt'