Set git merge.conflictstyle diff3, rm ping alias

Minor: swap spaces for tabs in gitconfig file