Pimp my .gitconfig
Add both VS2012 and VS2013 as diff tools, ditch rerere
Merge pull request #27 from github/gitconfig-tweaks

Add some features to the default gitconfig