Updates -- trying to get _git_cleanup to stick but failing
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitconfig