Added better support for CDN vs local determinations.
Updated docs
Merge pull request #1 from cbrito/4.0.x

4.0.x