Switch to registrator, confd update

Use the service catalog for upstreams, updated confd to 0.7.1, better
template logic