merge ocaml mode changes + other haskell local changes