add default.push=simple to gitconfig
Merge branch 'master' of github.com:shicks/config