use updated version of global.json for gh-pages
fixed the get Id function as ISO does not have _
Merge branch 'master' of github.com:csviz/csviz
merge conflict in build
Merge branch 'custom-choropleth'