slightly nicer import, factored some combinators out of local let
Merge branch 'master' of git://github.com/IreneKnapp/direct-web-bugs

Conflicts:
	Haskell/Main.hs