Removed spurious reference to byon
Fixed tearDown issue with already-released machine
Merge pull request #984 from Nakomis/fix-single-machine-location

Fix single machine location