Deployment tempdirs: Delete when out of scope, not atexit
D'oh
Close ssh master when out of scope, not atexit
SSHMaster: Keep a reference to the tempdir around so we can be sure it hasn't been deleted when closing the connection
Merge branch 'no-atexit' into upstream-master