Update post-merge hook to run grunt test

Also replaced a console.log with console.error