tweak mocha approvals to be a little more fluent
Fixing path issue on mac

p4merge reporter looked for p4merge.exe but on the mac it's p4merge