Removes .swp files and ignores them
Git ignore gave trouble
Merge branch 'static-pages'

Conflicts:
	.gitignore
Uses templates and let in the spec for static pages
Merge branch 'master' into static-pages

Conflicts:
	spec/requests/static_pages_spec.rb