reorg lot of stuff in vimrc