sync with Context as of 2013-05-17
remove untracked ``util-fmt`` from test
fix Makefile; README
Merge pull request #10 from phi-gamma/master

update