Update aliases
Remove MacVim Fugitive merge tool