Add explicit push=upstream default, mac was moaning
Merge branch 'master' of github.com:hjwp/dotfiles. fix conflict
push.default=upstream

Conflicts:
	.gitconfig