linux-ize git config
Merge branch 'master' of https://github.com/d10genes/dotfiles

Conflicts:
	files/dots/gitconfig
fixed botch merge