(.vimrc): cleanup, use new style throughout all config