Refactor of transfers, and now up/download resumes
Merge remote-tracking branch 'origin/scp'

Greg refactor.