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