Merge branch 'master' into gh-pages
remove unused and updates to chart.js
rename
Merge branch 'gh-pages'