vimr: Update to 0.3.0-21.
Merge pull request #7479 from simono/vimr-0.3.0

vimr: Update to 0.3.0-21.