add content-disposition option
Merge pull request #297 from freehaha/master

S3 - add content-disposition option