Merge branch 'master' into no_parallel

No_parallel was where I fixed leaking, parallelism might be
implemented later.

Conflicts:
	hanalyze.cabal
	merge_fds.hs
Merge branch 'no_parallel' of https://github.com/aquincum/hfinnish-corpus into no_parallel