Merge pull request #563 from benbjohnson/raft

bump(github.com/coreos/raft): cff0a00
chore(server): add +git to the version

we need to automate this but make sure versions built from git have
+git after the version number.
fix(etcd): get consistent with etcdctl on printing versions

Lets get a bit more consistent in printing the versions:

```
$ ./bin/etcd -version
etcd version 0.3.0+git
$ ./bin/etcdctl -v
etcdctl version 0.3.0+git
```
Merge pull request #565 from philips/cleanup-version

fix(etcd): get consistent with etcdctl on printing versions
chore(test): remove useless node1.etcd dir

It is a directory checked in from an etcd test run in mistake.
Merge pull request #566 from unihorn/3

chore(test): remove useless node1.etcd dir
fix(Documentation/tuning): fix incorrect comment about snapshot
feat(README): link to raft homepage
fix(Documentation): example of discovery in conf and env vars
Merge branch 'master' of https://github.com/coreos/etcd into registry