Add .merlin file
Update for OCaml 4.02 which has a modified AST