Updated s3 uploader to set filename and whether to include a date suffix