Etcd initial pass

Switch to using ETCD recommended by @shawnps  for more flexible configuration management,
Yes, space after comments please :bow: