fix up machine id
Fix Debugf.
Merge pull request #604 from howbazaar/fixup-master

Fixup master