fix(etcd): remove duplicate DataDir setup

In the refactor of the configuration and flags I think that we
accidently placed this logic twice. The side effect is that we always
ended up with a `.etcd` directory.
Merge pull request #329 from philips/remove-redundant-datadir-code

fix(etcd): remove duplicate DataDir setup