.merlin
opam file
regenerate with latest oasis
Merge pull request #27 from rgrinberg/master

opam + merlin file + oasis regenerate