Moar zsh/git improvements