Updated Makefile to reflect the stuff I actually use...