Merge pull request #17 from bketelsen/etcd-consul-crypt

Etcd consul crypt