ZSH fixes
Merge zshrc