added .swp to .gitignore
Merge branch 'gh-pages' of https://github.com/petrock/leaflet into gh-pages

Conflicts:
	.gitignore