More cleanup of vimrc; trying different things and failing.