update to s3_website v2; fix s3 redirects