Some ocamldoc in Conduit_mirage
Merge branch 'master' into gh-pages

Conflicts:
	lib/conduit_mirage.mli