Vim and Git tweaks