Added .gitconfig

Change-Id: If4166ec2e66575bb75ab769e2081d089459e9461
Merge branch 'master' of https://github.com/jburon/dotfiles

Conflicts:
	.gitconfig

Change-Id: I9bb59d55f62d712d7fd2b8b4f16d2160f873b154