Fix build against oasis 0.4.2; Add .merlin

Mostly untested.  It builds against 0.4.2.

The .merlin file is for convenience for those using merlin in their editor.