Vim files added.
Merged.