vim: switch colorscheme to desert256
gitconfig: add decoration to log

Conflicts:
	gitconfig