Vimrc: update config.
Vimrc: move comments.

Adding comments after the command would trigger warnings.