Clean up vim options
Add vim as mergetool
Change ~ to $HOME