Configure PROMPT to show git info
Merge branch 'zsh'