Tweaked Makefile to build with Intel C/C++ compiler