Add a Fonts.conf so I don't have to redo it again.
Set kdiff3 as diff and merge tool.
Add a few linux-specific items to gitignore.
New Emacs changes to be pushed.