merged christo's ssh_config changes