Clean up
Fix relative paths in emscripten build script
Merge remote-tracking branch 'origin/master'