A few changes, mostly to do with vim-r-plugin.