Add some ocamldoc options
Merge branch 'master' into gh-pages
fix typo
sync ocamldoc