vim and git improved