Comment out extra log statements
Travis CI compat, move mocha.opts into Makefile