Re-enable logging (to separate files for each machine)

This looks good to me, but someone else should test it to be sure.