Fixup Makefile, README to bood from 'make setup'