Makefile updated yet again for macneill