lots of clean up and simplification of vimrc.