sync hosts file state in blocks instead of lines
make get_machines return machine instances instead of machine names
merged @pbitty fix