Merge pull request #2477 from Ckins/patch-1

Update OCaml.gitignore

OCaml.gitignore

@@ -18,3 +18,6 @@ _build/
 # oasis generated files
 setup.data
 setup.log
+
+# Merlin configuring file for Vim and Emacs
+.merlin