Activate company mode support for merlin

Also, provide a commented out sample for activating autocomplete support
Remove hook to activate an apparently obsolete tuareg function

Trivially fixes #614 by simply removing the offending hook.
Merge pull request #624 from RadicalZephyr/prelude-ocaml-fix

prelude-ocaml fix