update vim & tmux, add mvimdiff as git mergetool