machine id fix
finally a real machine-id fix!
Merge pull request #196 from ryanpcmcquen/master

major machine fix