Cloudfront fixes

Note: one of the commits here will only work completely once #123 is merged in since the S3Origin property doesn't have to have any properties set.