git: disable backup for mergetool
vim: add some options for horizontal scrolling and other things
vim: remove numbertoggle (relativenumber ftw!)