Update to mocha 1.9, manage with npm
Manage rest of test libs with npm
Merge remote-tracking branch 'upstream/master'