Fiddling, further cleanup
Twiddled the config to build in advanced mode.
Merge branch 'master' into gh-pages
jsrebuild