this version of git does not support push=simple
Merge branch 'master' of github.com:mcdoh/DotFiles
added .zshrc, back to Solarized, better setup.sh
merging .zshrc changes