Update etcd dependency to 0.2; Major refactoring