Clean up autocmd
Vim shortcut updates