Add workaround for cloudfront issues w/ img/vid

Supports #245
Adjust test to handle disabled cdn

Supports #245