new upload implementation
remove s3 dep
don't log tmpdir
merged conflicts