Add labels to x-axis, integrate chartjs
Update TODOs, strip out d3js
Update TODOs, tidy code