Remove left over vim headers

These files were being added at the time when the comments were removed
from the rest of the project.

Change-Id: I5ece3ee3f7ce02ffd3914c644a2b99fc84c3f31c
Fix a misspelling in a comment

Change-Id: If049cef6def1249fd0f70e16385aa7a4167edbde
Merge "Remove left over vim headers"
Test commit