Asset update
Plain ol' javascript instead of browserify
Add D3js
Merge