tweaks
Merge remote-tracking branch 'github/master'
zsh git prompt update