Minor rejiggering of package
Mocha options. Cos who really finds the default useful?