Fix scrubbing the machine files
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server.c
Fix loop termination after if statement
Fix logical errors in checking the incarnation.
Merge pull request #7 from Curlyfries13/master

Fix infinite loop