updated Makefile and mp_cuda.h to compile cleanly on lab machines