Tuned ignored files.
Merge with upstream.