verison bump
Merge branch 'master' of github.com:cgaebel/stm-conduit

Conflicts:
	stm-conduit.cabal