Added .swp files to .gitignore.
Merge branch 'develop'