Updated to new gcovr, fixedup makefile