state: WatchMachines should watch the topology, not the zk children
TODO: there is still to much string munging going on here, I will
open a branch to define equality for *Machines which will reduce
the stringyness a bit.
R=niemeyer
CC=
https://codereview.appspot.com/6210066