Updates from jpl

Conflicts:
	.gitconfig
	.ssh/config
	.ssh/known_hosts