Add the Merlin completion engine for Ocaml
Improve find-function support

Remove our own bindings in favor of the standard bindings from
find-function-setup-keys