Pull upstream oh-my-zsh changes
Merge branch 'master' of github.com:jdavis/dotfiles