Ignore .swp files, created by vi.
Merge branch 'master' of https://github.com/scalatest/scalatest