Update Makefile

Sorry Nicholas, I got rid of some of your work in the makefile because it wasn't compiling on unix.ic.ucsc.edu. Please fix.