Minor tweaks.
Fix colors for magit.

Conflicts:
	emacs/emacs.el