Merge pull request #1 from xiangli-cmu/master

Change imports to coreos/etcd coreos/go-raft
Merge https://github.com/coreos/etcd