Merge branch 'gh-pages' of github.com:github/government.github.com into gh-pages

Author: jbjonesjr

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,15 @@
+Thanks for the contribution! **Below** is a template that can make it easier when submitting your Organization:
+
+**Your Organization**: _ACME Agency_  
+**GitHub Organization url**: _@acmeagency_  
+**Country/Locality**: _Alberta, Canada_
+
+Inclusion requirements:
+- [ ] Referenced account is an [Organization](https://github.com/github/government.github.com#add-organization) not a User^
+- [ ] If this is a government project, your Organization's description should include a reference to your country/agency.
+- [ ] Make sure your Organization includes at least one public repository
+- [ ] Please also include a URL for your organization that links back to your organization or agency homepage.
+ 
+^ If you want to convert your account to an org, details can be found here: https://help.github.com/articles/converting-a-user-into-an-organization/
+  
+ :heart: GitHub Government Contributors

.gitignore

@@ -11,4 +11,5 @@ assets/vendor/**/*.txt
 assets/vendor/bootstrap-sass/assets/javascripts/
 .sass-cache
 .env
-tmp/
+.jekyll-metadata
+tmp/

404.md

@@ -3,9 +3,9 @@ layout: support-page
 title: Not found
 ---
 
-## The page you're looking for doesn't seem to be there!
-
-### Maybe we can find it together if you search below.
+<p class="text-center alt-lead">
+  The page you're looking for doesn't seem to be there!
+</p>
 
 <script>
   var GOOG_FIXURL_LANG = "en";

Gemfile

@@ -2,17 +2,15 @@
 
 source 'https://rubygems.org'
 
-gem 'coffee-script'
-gem 'coffee-script-source', '~> 1.11.1'
-gem 'github-pages', '105'
-gem 'jekyll-avatar'
-gem 'rake'
+gem 'github-pages'
+gem 'jekyll-octicons'
+# need lazy-load support
+gem 'jekyll-avatar', '>= 0.6.0'
 
 group :development, :test do
   gem 'html-proofer'
-  gem 'octokit'
   gem 'parallel'
-  gem 'pry'
+  gem 'rake'
   gem 'rubocop'
   gem 'typhoeus'
 end

_config.yml

@@ -9,15 +9,21 @@ analytics_account: "UA-3769691-28"
 # build settings
 exclude: ["script", "vendor", "bower.json", "Gemfile", "Gemfile.lock", "Rakefile", "readme.md", "package.json"]
 markdown: kramdown
-gems:
+plugins:
   - jekyll-avatar
   - jekyll-redirect-from
   - jekyll-seo-tag
   - jekyll-coffeescript
   - jekyll-sitemap
+  - jekyll-octicons
 
 sass:
   style: :compressed
+  # Where you keep your scss files
+  sass_dir: assets/css/
+  # Where sass should look for other scss
+  load_paths:
+    - node_modules/
 
 # orgs on front page
 featured_orgs:

_data/civic_hackers.yml

@@ -2,16 +2,22 @@
 
 Civic Hackers:
   - 16iacc
+  - activate
   - adhocteam
   - akroncivichackathon
+  - analyticsmj
   - avoindata
-  - BD-IATI
+  - bd-iati
+  - betanyc
+  - cahealthdata
+  - chihacknight
   - ciudadanointeligente
   - civcoms
   - civic-commons
-  - civicdataeu
   - civicninjas
   - civicquarterly
+  - civictechro
+  - civilserviceusa
   - civio
   - code-tj
   - codeandomonterrey
@@ -21,24 +27,29 @@ Civic Hackers:
   - codesy
   - correctiv
   - databr
-  - DataKind
-  - DataKind-UK
-  - datamade
+  - datakind
+  - datakind-uk
+  - datashades
   - datauy
   - dataviz
   - dclegalhackers
-  - DemocracyClub
+  - democracyclub
   - democracyworks
   - developmentseed
+  - digitalstate
   - dobtco
   - drupal4gov
   - dssg
+  - dutsec
   - dxw
+  - e-government-ua
+  - edgi-govdata-archiving
   - electionleaflets
   - everypolitician
   - everypolitician-scrapers
   - girlscodingkosova
   - gitmachines
+  - goc-spending
   - govex
   - govhackaustralia
   - govready
@@ -48,16 +59,22 @@ Civic Hackers:
   - hubcivico
   - influencemapping
   - infoculture
+  - justopensource
   - koelnapi
   - lisbon-opendata
   - localdata
+  - localwiki
+  - mainecivichackday
   - mapnificent
-  - mapseed
+  - mil-oss
   - myanmarapi
   - mysociety
+  - nationaldayofcivichacking
+  - ncopenpass
   - netzwerkrecherche
   - npp
-  - NRGI
+  - nrgi
+  - nuknightlab
   - nycedc
   - obshtestvo
   - occrp
@@ -89,12 +106,12 @@ Civic Hackers:
   - opennorth-archive
   - openopps
   - openplans
-  - openregister
   - openstate
   - openstates
   - opented
   - openva
   - otvorenesudy
+  - partidodigital
   - planningalerts-scrapers
   - plonegov
   - poplus
@@ -105,9 +122,9 @@ Civic Hackers:
   - ropengov
   - safecast
   - security-force-monitor
+  - smartchicago
   - smcgov
   - spaceadvocates
-  - spendb
   - stadtlandcode
   - statedecoded
   - sunlightlabs
@@ -123,6 +140,7 @@ Civic Hackers:
   - yourmapper
 
 Code for All:
+  - code4romania
   - code4sa
   - codeandomexico
   - codeforafrica
@@ -142,9 +160,8 @@ Code for All:
 
 Code For America:
   - a2civictech
-  - activate
-  - betanyc
-  - bikesafety
+  - blue-sky-skunkworks
+  - brigadehub
   - caciviclab
   - cforlando
   - civicdata
@@ -180,6 +197,7 @@ Code For America:
   - codeforftl
   - codeforgiessen
   - codeforgso
+  - codeforhamburg
   - codeforhawaii
   - codeforibaraki
   - codeforjerseycity
@@ -190,36 +208,39 @@ Code For America:
   - codeformuenster
   - codeformunich
   - codefornh
+  - codefornola
   - codefornrv
   - codeforokinawa
   - codeforpg
   - codeforphilly
   - codeforportland
-  - codeforraleigh
   - codeforrockford
   - codeforrva
   - codeforsanjose
   - codeforsapporo
   - codeforsummitcounty
+  - codefortallahassee
   - codefortucson
   - codefortulsa
   - codefortuscaloosa
   - codeforvegas
   - codeisland
-  - e-government-ua
+  - cognoma
+  - datamade
+  - dedupeio
   - friendlycode
   - hackforla
   - hackingmadison
   - hackmichiana
-  - localwiki
-  - mainecivichackday
-  - nationaldayofcivichacking
+  - hacktahoe
+  - mapseed
+  - nodeschool
   - nucivic
-  - nuknightlab
   - open-austin
   - openchattanooga
   - opencleveland
   - opendata-heilbronn
+  - opendatapolicingnc
   - opendatastl
   - openkawasaki
   - openlexington
@@ -228,13 +249,15 @@ Code For America:
   - opensaltlake
   - opensandiego
   - opensatx
+  - opensavannah
   - opensmc
   - opentwincities
   - openwichita
   - openzagreb
   - sarl-hackerspace
   - sfbrigade
-  - smartchicago
+  - webuildcity
+  - wevote
 
 Open Knowledge Foundation:
   - bundestag
@@ -256,4 +279,4 @@ Open Knowledge Foundation:
   - openspending
   - OpenTransport
   - opentrials
-  - Recline
+  - os-data