fix(server): Fail startup if machine ID undetectable

Fix #420
refactor(machine): Simplify machine.New
Merge pull request #422 from bcwaldon/420

Fix #420 & refactor machine.New