Tweak makefile to work vs. trunk; update README