Add vsdiffemerge options to git's diff/merge tools
Add some new git aliases
Remove name/email from gitconfig - repo was showing up on Google