Tidy `.gitignore`.
Fixed a bug where some zone lines were discarded.
Merge branch `eeror` into `master`.