Add in zuul_ref to unique_id

Also add a new pretty_id which will be used for
detailing, but use the unique_id for identification.