Rebuilt to use modern dependencies
Merge branch 'master' of github.com:ekmett/trifecta

Conflicts:
	src/Text/Trifecta/Combinators.hs
	trifecta.cabal