S3 - add content-disposition option

I'm not sure why it was commented out but I needed this and I think it should be an option.