lots of clean up of vimrc