update vim and gitconfig to use meld