Move to terminal vim; updates