Merge ips' changes.
Merge branch 'master' into hlint

Conflicts:
	AhoCorasick.hs
	Trie.hs
	main.hs
Few stylistic changes.