Clean up main.js
Whoops
Merge branch 'master' into gh-pages