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