Updated Makefile for Linux a bit, some work remains to reflect new source files and other changes that happened in the source code