Agree with all the location-filtering comments. Refactored to use guava and generally make it a lot cleaner. See new `Locations` class and improvemetns to existing `Machines` classes.