Makefile.extern now includes definitions of MPICC and MPICCC
Fix to disable comparison tags for individual threads

Fix to merging