added gitconfig
Merge branch 'master' of jshawl.com:/git/dotfiles
fixed merge conflict in gitconfig