Peg sinon version, and update mocha

This should resolve #21

As far as I can see the latest working version of the npm sinon package is 1.7.1. The previous version we used, 1.6.0, also works so that is also an option.

Have also updated the mocha files with copies from the npm mocha package.