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