Consolidating some common config between bash/zsh.
Resolving a conflict in zshrc.