Add some features to the default gitconfig

* Add some common aliases
* Disable whitespace whining
* Enable rerere to auto-resolve previously seen merge conflicts
* Enable histogram diff, which produces nicer diff results
* Update the Diff tool to VS2013