Fix CDN usage
Merge pull request #570 from pborreli/fix-cdn-usage

Fix CDN usage
Polished Travis-CI handling