Merge branch 'master' of github.com:diogro/oh-my-zsh
Merge branch 'master' into local