Building docker-gen from source because I gave up on releasing a binary
Use the docker container name, not image name, as the backend name
Merge branch 'use-container-name' into durp
restructure etcd key so multiuple of the same service can be up at the same time
Merge branch 'durp' into outage-less

Conflicts:
	etcd.tmpl
added in change of using container name to mach merged in changes
fixed array index in template and used ombitrons repo for docker-gen
fixed format of etcd key