aphrodite doesn't make coal default; fix hang in waitForSsh in trojan; fix getting homeric machines by name