.gitignore updates.
Merge branch 'master' of github.com:ljohnston/vim