Update to mocha 2