Integrate with the new workflow
Resolve conflicts; ignore generated JavaScript

Also, add in D3 from the CDN
Mop up Git conflict throw up
Add in some buggy visualization support