Tidy up configuration file (keep repos and groups together).

UCC git Repository :: git.ucc.asn.au