gofmt
Merge pull request #1 from ccding/master

gofmt
change machine to v1/machine
Merge https://github.com/xiangli-cmu/go-etcd
Merge pull request #22 from xiangli-cmu/master

change api