Minor reorganization of vimrc