Fix up a number of .gitignore entries.

Most of these were caused by c41b090ecc14ddd6b3531dc7e5ce36b21e253fdd.