Added OCaml and Coq major modes to Emacs
Merge branch 'master' into unix