No-op esc in vim and fixing git upstream helper