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

Greg refactor.
Incorporate backend refactor into gui.
Merge branch 'master' into ui