Make location of done instances public
Fix call to done instances location
Embbed error from file marshaling
Merge branch 'master' into add-srvinfo

Conflicts:
	proc.go