Got rid of some dumb whitespace settings in .gitconfig.
Bump .emacs.d change conflict resolution style.