Merge pull request #111 from dsheets/merlin

Merlin support
Add .merlin to distclean

Also, .gitignore it. Fixes #112.