Clean up gitconfig, allow local override
Clean up zshrc
Add zsh_aliases
Add tig settings
Re-add zsh-aliases