Reorganize zsh config
Merge branch 'master' of https://github.com/markmcconachie/zsh-config