Update README and clean up Makefiles a bit