added push.default=simple config, as is default in future git
Merge branch 'master' of github.com:robu/utilsanddotfiles