ocaml: update init files
emacs: update merlin/ocp-indent support