Create and user gdiff mergetool.

Fix a few minor config issues.
Change default editor for git to gvim.
Use --remote-silent instead of --remote with gvimr aliases.