Fix typo on ssh.ProxyCommand
Changelog re #1046, fixes #1046
Apply fix from #917
Whitespace
Nuke super old and misleading 'integration' test file
Add integration level test proving #917
Make integration suite somewhat more idempotent