updated .gitconfig
State of 2013-01-21
Merge branch 'master' of git://github.com/lwille/dotfiles

* 'master' of git://github.com/lwille/dotfiles:
  Adapted configuration

Conflicts:
	.extra.dist