cleanup and fix .vimrc