Merge branch 'master' into displays
Add d3.js to assets dir
Merge branch 'displays' of github.com:tolien/data-tracker into displays