fix broken build
Merge branch 'master' into datavis
rewrite of the D3 code