Fill in some todo's
Merge branch 'master' of https://github.com/ekmett/hask

Conflicts:
	wip/Obj.hs