.zshrc updates pre merge
Merged .zshrc