more ocamldoc in Conduit
Merge branch 'master' into gh-pages
sync ocamldoc