Merge pull request #27 from rgrinberg/master

opam + merlin file + oasis regenerate