Removed push=simple from gitconfig because it doesn't work on older git versions
Merge branch 'master' of github.com:njbair/dotfiles
Updated oh-my-zsh