Integration

- Make `.{hg,git}ignore` files practically identical
- Make use of tmpdir and monkeypatch modules to clean up fixture (undoes stuff for us!)