Make Macvim the standard git mergetool
Fix vim alias