Update Organization list

A handful of recently discovered orgs from NZ and CA.

Also moved "United States" to "U.S. Federal" for clarity and so that all US orgs are grouped together alphabetically.