SQUASH into web-server rewrite, fix pause on node 0.8
WIP: SQUASH make jshint happy