new vim stuff (master)