Gitignore modified for vim files.
Merging