Added colors to gitconfig
Added a better vimdiff git merge tool

For more info: http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool
Made vimdiff the default way to git diff

Use the --no-ext-diff option to git diff (preferably in an alias) to disable.