Merge pull request #33 from bcwaldon/etcd-dropin-run

fix(etcd): Place etcd.service drop-in in /run
feat(etcd): Default etcd name to /etc/machine-id
feat(etcd): Fall back to hostname if no machine-id