remove push.default = simple. that is now the default in git
Merge branch 'master' of github.com:adamtait/dotfiles