Added more restrictive swp file ignore
Better swp ignore, and dropdown list
Merge branch 'release/0.6.0'

Conflicts:
	server.rb