Bump to 1.7
Clean up VimEnter autocmd