Tweak Vim config + minor cleanup