vimrc fixes and cleaning