Clean up Makefile
Update README