Improve .gitignore, add .merlin.
Merge pull request #63 from Drup/misc

Improve .gitignore, add .merlin.