Mix latest master with npm fork

[jgoz]

This rebases the changes from the fork published to npmjs onto the latest official master and configures it for our internal package server.

Optional things that could be done:

• CommonJS-ify all the plugins
• Provide browserify-shim config in package.json

[jgoz]

Pulled to the wrong upstream branch.