Upgrade to latest NMSSH (commit 606537d858175688c5a0b24c1a140d03dca62e30)
Add files missing from previous commit
Merge branch 'master' of https://github.com/gnachman/iTerm2
Change SCPFile to use ssh_config