Refactor to accomodate new problems

Signed-off-by: Eli Skeggs <skeggse@gmail.com>
Switch to url config for queue

Signed-off-by: Eli Skeggs <skeggse@gmail.com>
Switch to new usage for service-discovery

Signed-off-by: Eli Skeggs <skeggse@gmail.com>
Switch git urls

Signed-off-by: Eli Skeggs <skeggse@gmail.com>