Etcd watcher

Building on #505, this implements etcd's watch in a form that I can hook up to the apiserver.