working on loading in js libs
Merge branch 'master' into gh-pages