Adding zsh config
Merge branch 'zsh'