fixed gitconfig
Merge branch 'master' of https://github.com/rblack42/dotfiles
updated gitconfig