Merge branch 'master' of https://github.com/robbyrussell/oh-my-zsh
Merge branch 'master' of https://github.com/jjosh-mcintosh/oh-my-zsh