Changes to etcd to get setup and start to run.
Merge pull request #5 from bretthoerner/etcd-changes

Changes to etcd to get setup and start to run.