Update Makefile to be more makey