Remove colors because we're in zsh now
Add zsh git prompt
Merge branch 'master' of github.com:francispotter/bash-setup