Bug fix: global vars used d3 before loading
Merge branch 'map-names' into gh-pages