Apply updates from master
Add do_sshfile.py script for dealing with proxied files over SSH