Revert to cloudfront host for now
Merge branch 'master' into integration