Bleh
Finally preserving _js_setup and co
Cleanup, webkit fixes
Merge branch 'master' into js
Merged
More webkit fixes
Particle refactoring
Particle refactoring
ibid.
Merge branch 'js'
More prettiness