Updates git to use Araxis Merge for diff/merge.
Updates pathogen's installation.