Fix git completion in zsh under the "g" alias
Merge branch 'master' of github.com:abeaumet/dotfiles
Update zsh prompt