Reorganization/rewrite of vimrc.