import from coreos
Merge pull request #1 from xiangli-cmu/master

import from coreos/etcd