Update .gitignore from .bzrignore

There was one monolithic .bzrignore while .gitignore files
were scattered in a few directories.  Merge the contents
of these stale .gitignore files with .bzrignore, obtain
unique entries, and then distributed back down to directories
containing .gitignore.