Compile fixes for ocaml 4.02.1+

This makes master compile ok using ocaml 4.02.1 or higher. Also added a provisional merlin file.