Catch SIGQUIT for cleanup
Merge branch 'master' into handle_sigquit

Conflicts:
	server.go
Merge pull request #2957 from creack/handle_sigquit

Catch SIGQUIT for cleanup