added push.default and made some other changes to keep to date

Conflicts:
	git/global.gitconfig