Add promptness test
Add associativity tests from @DanBurton
Merge branch 'master' into inject

Conflicts:
	conduit/test/main.hs
Add another failing test case