Add merlin integration
Makefile: simplifications
ocamlbuild: use ocamlfind