Merge branch 'master' into popl2012

Some changes were upstreamed into master, sometimes with further
improvements.  Merging them back.

Conflicts:
	program/Evaluation.hs
	program/Main.hs
	program/Makefile
	program/TestUtils.hs
	program/example.in

diff --cc program/Main.hs
Simple merge