Update gitconfig, add branch aliases and small tweaks
[zsh] Fix hardcoded grep path