Prelude ocaml fix

Activate company mode support in merlin, and remove the hook that is causing an error as described in issue #614.