Upgrade Mocha and Mochify to 2.0