bbatsov/prelude — pull request #624 by RadicalZephyr (2014-07-28 20:01:08+00:00)
Title: Prelude ocaml fix

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