remove trailing whitespace
pass tuples, use correct function
Merge remote-tracking branch 'ichi/master'

Conflicts:
	s3-mp-download.py
	s3-mp-upload.py