misc updates
Merge branch 'master' into work

Conflicts:
	gitconfig