Cerry-picking zsh configuration changes from master branch