Fix up gmock include directories cache variable.

- Also remove stray .swp file that was committed.