Include nested modules within their parents
Merge branch 'flat-files'

Conflicts:
	src/opamDocCmi.ml
	src/opamDocCmti.ml
	src/opamDocTypes.mli
	src/opamDocXml.ml