updating vimrc with conflict multiple lines per thing, leaving tab and closing improvements, and safe checkout