[WIP] Fiddling with Haskell modules
Fix up PR notes
Merge remote-tracking branch 'origin/master' into pr/21

Conflicts:
	Text/Documentalist/CommentParser.hs
Merge pull request #21