Update zsh_config.zsh
Merge remote-tracking branch 'origin/master'