Updated ssh_config
Merge branch 'master' of github.com:xj9/usr

Conflicts:
	etc/ssh_config