Cleanup makefile, chip away at coveralls