fix vim background color
combine ruby filetype lines
configure vimdiff for git difftool