using https urls for cartodb basemaps CDB-2711
Merge remote-tracking branch 'origin/master' into CDB-2711
Merge pull request #394 from CartoDB/CDB-2711

using https urls for cartodb basemaps CDB-2711