Add flicts alias as duplicate of conflicts

Because it autocompletes faster
Add core.editor=vim
Add mergetool and difftool aliases
Remove unused or repetive config
Alphabetize aliases