Avoid internals, get conduit 1.2 support
Merge github.com:wowus/stm-conduit

Conflicts:
	stm-conduit.cabal
Merge pull request #27 from snoyberg/master

conduit 1.2 support (by avoiding internals)