add browserify magic
Add final CommonJS/browserify magic.

Conflicts:

	javascript/faye.js
A couple of tweaks to package.json.
Update our copy of json2.js.