Merge pull request #1359 from philips/fix-mismatch-error

etcdserver: fixup mismatch error line
etcdserver: admin endpoint accepts json body
Merge pull request #1357 from coreos/accept_json

etcdserver: admin endpoint accepts json body
version: move version string into new package
gitignore: be more specific when ignoring /etcd
godep: add deps for etcdctl
etcdctl: import from external repo
etcdctl: remove build indicator from README.md
etcdctl: reflect build script location in README.md
etcdctl: update to meet go vet