Make it easy to re-source zsh
Merge branch 'zsh'