github
diff --git a/‎_data/civic_hackers.yml‎
Lines changed: 85 additions & 87 deletions b/‎_data/civic_hackers.yml‎
Lines changed: 85 additions & 87 deletions
diff --git a/‎_data/governments.yml‎
Lines changed: 12 additions & 9 deletions b/‎_data/governments.yml‎
Lines changed: 12 additions & 9 deletions
diff --git a/‎_data/research.yml‎
Lines changed: 1 addition & 0 deletions b/‎_data/research.yml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎script/fetch-us‎
Lines changed: 2 additions & 2 deletions b/‎script/fetch-us‎
Lines changed: 2 additions & 2 deletions
@@ -1,125 +1,125 @@
 # Add non-profits or groups focused on government
 
 Civic Hackers:
+  - 16iacc
+  - adhocteam
   - akroncivichackathon
+  - avoindata
+  - BD-IATI
+  - ciudadanointeligente
+  - civcoms
+  - civic-commons
+  - civicdataeu
+  - civicninjas
+  - civicquarterly
   - civio
   - code-tj
+  - codeandomonterrey
   - codeforhuntsville
+  - codeforoakland
   - codeforseattle
+  - codesy
+  - correctiv
   - databr
+  - DataKind
+  - DataKind-UK
+  - datamade
   - datauy
   - dataviz
+  - dclegalhackers
+  - DemocracyClub
+  - democracyworks
+  - developmentseed
   - dobtco
+  - drupal4gov
+  - dssg
   - dxw
+  - electionleaflets
+  - everypolitician
+  - everypolitician-scrapers
+  - girlscodingkosova
   - gitmachines
+  - govex
+  - govhackaustralia
+  - govready
+  - govtrack
+  - hackforchange
   - hasadna
   - hubcivico
+  - influencemapping
   - infoculture
   - koelnapi
+  - lisbon-opendata
   - localdata
+  - mapnificent
   - mapseed
   - myanmarapi
   - mysociety
+  - netzwerkrecherche
   - npp
+  - NRGI
   - nycedc
   - obshtestvo
+  - occrp
   - odhk
   - open-city
+  - open-data-standards
+  - open311
+  - openaddressesuk
   - openaustralia
+  - openbudget
+  - opencivicdata
+  - opencolorado
+  - opendata
+  - opendatahk
   - opendatakosovo
-  - girlscodingkosova
+  - opendatalab-de
   - opendatatajikistan
+  - opendatateam
+  - opendatatrentino
+  - openfisca
+  - opengovernment
   - opengovfoundation
   - opengovld
   - openjc
   - openkratio
+  - openlawdc
   - opennewzealand
   - opennorth
+  - opennorth-archive
   - openopps
   - openplans
+  - openregister
   - openstate
+  - openstates
+  - opented
   - openva
   - otvorenesudy
+  - planningalerts-scrapers
+  - plonegov
+  - poplus
+  - popolo-project
   - postcode
+  - procurement-analytics
+  - pwyf
   - ropengov
   - safecast
+  - security-force-monitor
+  - smcgov
   - spaceadvocates
+  - spendb
+  - stadtlandcode
   - statedecoded
   - sunlightlabs
+  - sunlightpolicy
   - teampopong
+  - tfrce
   - thacker
   - theodi
+  - tulsawebdevs
   - unitedstates
   - votinginfoproject
   - yourmapper
-  - govready
-  - govtrack
-  - plonegov
-  - civicquarterly
-  - govex
-  - opengovernment
-  - drupal4gov
-  - smcgov
-  - govhackaustralia
-  - dssg
-  - tulsawebdevs
-  - openlawdc
-  - hackforchange
-  - tfrce
-  - civcoms
-  - everypolitician-scrapers
-  - dclegalhackers
-  - datamade
-  - avoindata
-  - adhocteam
-  - everypolitician
-  - openaddressesuk
-  - civic-commons
-  - ciudadanointeligente
-  - codeandomonterrey
-  - planningalerts-scrapers
-  - sunlightpolicy
-  - civicninjas
-  - openfisca
-  - openregister
-  - developmentseed
-  - codeforoakland
-  - opendatalab-de
-  - opendatateam
-  - opendata
-  - openstates
-  - codesy
-  - democracyworks
-  - civicdataeu  
-  - open311
-  - opendatahk
-  - opencolorado
-  - openbudget
-  - open-data-standards
-  - lisbon-opendata
-  - opendatatrentino
-  - opencivicdata
-  - poplus
-  - opennorth-archive
-  - influencemapping
-  - NRGI
-  - popolo-project
-  - security-force-monitor
-  - opented
-  - pwyf
-  - procurement-analytics
-  - 16iacc
-  - BD-IATI
-  - DemocracyClub
-  - DataKind-UK
-  - DataKind
-  - electionleaflets
-  - stadtlandcode
-  - occrp
-  - correctiv
-  - netzwerkrecherche
-  - spendb
-  - mapnificent
 
 Code for All:
   - code4sa
@@ -192,6 +192,7 @@ Code For America:
   - codefornrv
   - codeforokinawa
   - codeforpg
+  - codeforphilly
   - codeforportland
   - codeforraleigh
   - codeforrockford
@@ -204,11 +205,14 @@ Code For America:
   - codefortuscaloosa
   - codeforvegas
   - codeisland
+  - e-government-ua
   - friendlycode
   - hackforla
   - hackingmadison
   - hackmichiana
   - localwiki
+  - mainecivichackday
+  - nationaldayofcivichacking
   - nucivic
   - nuknightlab
   - open-austin
@@ -230,31 +234,25 @@ Code For America:
   - sarl-hackerspace
   - sfbrigade
   - smartchicago
-  - e-government-ua
-  - codeforphilly
-  - nationaldayofcivichacking
-  - mainecivichackday
-
-
 
 Open Knowledge Foundation:
-  - okfde
-  - opendatanetwork
   - bundestag
+  - ckan
+  - CultureLabs
+  - dataprotocols
+  - datasets
+  - frictionlessdata
+  - Jugendhackt
+  - okfde
   - okfegypt
   - okffi
-  - OParl
-  - Jugendhackt
+  - okffi-science
   - okfn
   - okfn-brasil
-  - ckan
-  - opentrials
-  - okffi-science
-  - frictionlessdata
-  - dataprotocols
-  - openspending
+  - OParl
+  - opendatanetwork
   - openknowledgebe
-  - datasets
+  - openspending
   - OpenTransport
-  - CultureLabs
+  - opentrials
   - Recline
@@ -96,8 +96,8 @@ Canada:
   - cityofgreatersudbury
   - cityofottawa
   - cityofsurrey
-  - communicationssecurityestablishment
   - cngo
+  - communicationssecurityestablishment
   - ECCC-MSC
   - electionsquebec
   - GeoCanViz
@@ -155,8 +155,8 @@ European Union:
   - europeana
 
 Finland:
-  - Digipalvelutehdas
   - City-of-Helsinki
+  - Digipalvelutehdas
   - finnishtransportagency
   - Helsingin-kaupungin-tietokeskus
   - helsinki-city-library
@@ -221,7 +221,7 @@ Japan:
   - nhohq
   - nims-library
   - wakayama-pref-org
-  
+
 Jersey:
   - statesofjersey
 
@@ -233,8 +233,8 @@ Lithuania:
   - vilnius
 
 Luxemburg:
-  - opendatalu
   - Geoportail-Luxembourg
+  - opendatalu
 
 Malaysia:
   - pmo2
@@ -243,9 +243,9 @@ Mexico:
   - CSB-IG
   - DDT-INMEGEN
   - inmegen
+  - mxabierto
   - profeco
   - redoaxacadetodos
-  - mxabierto
 
 New Zealand:
   - CanterburyRegionalCouncil
@@ -293,9 +293,9 @@ Poland:
   - Ministerstwo-Cyfryzacji
 
 Romania:
+  - gov-ithub
   - govro
   - MinistryOfLabor
-  - gov-ithub
 
 Saudi Arabia:
   - SAS-NCDC
@@ -308,8 +308,8 @@ South Africa:
   - eddZA
 
 Spain:
-  - AyuntamientoMadrid
   - AjuntamentdeBarcelona
+  - AyuntamientoMadrid
   - ctt-gob-es
   - icane
   - JuntaDeAndalucia
@@ -372,10 +372,10 @@ U.K. Central:
   - dvsa
   - EnvHack2
   - EnvironmentAgency
+  - GCHQ
   - gds-attic
   - gds-dead
   - gds-operations
-  - GCHQ
   - guidance-guarantee-programme
   - hmrc
   - insolvencyservice
@@ -542,8 +542,10 @@ U.S. Federal:
   - defense-cyber-crime-center
   - demand-driven-open-data
   - department-of-veterans-affairs
+  - deptofdefense
   - dhs-ncats
   - didsr
+  - digital-analytics-program
   - EEOC
   - energyapps
   - erdc-cm
@@ -612,6 +614,7 @@ U.S. Federal:
   - SERVIR
   - state-hiu
   - sunpy
+  - us-bea
   - US-CBP
   - usagov
   - usaid
@@ -694,6 +697,7 @@ U.S. States:
   - idahofishgame
   - investmentboard
   - LADCO
+  - LibraryofVA
   - massgov
   - MFWP-GIS
   - mn-script-team
@@ -716,7 +720,6 @@ U.S. States:
   - twdb
   - TxDOT
   - UtahForestryFireStateLands
-  - LibraryofVA
   - VDEQ
   - VDGIF
   - Virginia-Department-of-Health
 
@@ -1,4 +1,5 @@
 # Government funded research - must have a government email/domain to be listed
+
 New Zealand Crown Research Institutes:
   - AgResearch
   - niwa
 
@@ -21,8 +21,8 @@ us_gov   = org_file['U.S. Federal'].map(&:downcase)
 research = YAML.load_file('./_data/research.yml').values.flatten
 existing = (gov + research).flatten.map(&:downcase)
 
-orgs = JSON.parse open('http://registry.usa.gov/accounts?service_id=GitHub&format=json').read
-orgs = orgs['accounts'].collect { |data| data['account'] }
+orgs = JSON.parse open('https://usdigitalregistry.digitalgov.gov/api/v1/social_media.json?services=github').read
+orgs = orgs['results'].collect { |data| data['account'] }
 
 orgs.each do |org|
   next if existing.include?(org.downcase)
Original file line number	Diff line number	Diff line change
@@ -1,4 +1,5 @@
1	1	# Government funded research - must have a government email/domain to be listed
	2	+
2	3	New Zealand Crown Research Institutes:
3	4	- AgResearch
4	5	- niwa