Improve .gitignore, add .merlin.

I know, I'm using the concurrence. :p