Cleaned up the Makefile and deleted the old Makefile (Makefile.bak).