Upgrade to mocha 2