Fixed the makefile
Blew away chriss changes to the make file