Add compact option to site-uuid.
Fix merge conflict
Merging pull request #134
Merge branch 'eiriksm-site_uuid_compact'