Push to upstream by default
merge origin/master
WHoops, stash
Merge branch 'master' into osx

Conflicts:
	.gitconfig