Rebase off 0.7 branch.

Major syntax changes in 0.8 did not seem to work.

Commit lib-cjs to use in projects.