Merge pull request #20 from snoyberg/master

conduit 1.1
verison bump
Allow transformers-0.4.
version bump
.gitignore update
Dependency versioning and fixing warnings
Merge pull request #23 from RobotGymnast/master

Minor build-level changes
Relaxed output type constraints for mergeSources and mergeConduits.
Generalized type of mergeSources and (>=<) per issue #25.
Merge pull request #26 from dmcclean/generalize-mergesources

Generalized type of mergeSources and (>=<) per issue #25.
verison bump
Merge github.com:wowus/stm-conduit

Conflicts:
	stm-conduit.cabal