DOI-ONRR · meiqimichelle · Apr 18, 2017 · Mar 9, 2017 · Mar 15, 2017 · Mar 15, 2017
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -43,7 +43,7 @@ If you would like to query the local database instance:
 To update site data, run `make site-data`.
 
 ### Deployment
-This site is deployed on [Federalist](https://federalist.18f.gov) whenever a commit it pushed to GitHub. Changes are deployed automatically to the production site when commits are pushed to the `master` branch.
+This site is deployed on [Federalist](https://federalist.fr.cloud.gov/) whenever a commit it pushed to GitHub. Changes are deployed automatically to the production site when commits are pushed to the `master` branch.
 
 If deploying the site to a production environment, make sure to minify the JS files:
 

diff --git a/Makefile b/Makefile
@@ -656,13 +656,13 @@ tables/all_production: data/all-production/product
 	rm $$tmp
 	@$(call load-sql,data/all-production/rollup.sql)
 
-tables/company_revenue: data/company/years
+tables/company_revenue: data/company-revenue/output
 	@$(call drop-table,company_revenue)
 	tmp=$^/all.ndjson; \
 	for company_filename in $^/????.tsv; do \
 		filename="$${company_filename##*/}"; \
 		COMPANY_YEAR="$${filename%%.*}"; \
-		$(tito) -r tsv --map ./data/company/transform.js \
+		$(tito) -r tsv --map ./data/company-revenue/transform.js \
 			$$company_filename >> $$tmp; \
 	done; \
 	$(tables) -i $$tmp -t ndjson -n company_revenue && \

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@ Fixes issue(s) # .
 
 [![CircleCI](https://circleci.com/gh/18F/doi-extractives-data/tree/BRANCH_NAME.svg?style=svg)](https://circleci.com/gh/18F/doi-extractives-data/tree/BRANCH_NAME)
 
-[:sunglasses: PREVIEW](https://federalist.18f.gov/preview/18F/doi-extractives-data/BRANCH_NAME/)
+[:sunglasses: PREVIEW](https://federalist.fr.cloud.gov/preview/18f/doi-extractives-data/BRANCH_NAME/)
 
 Changes proposed in this pull request:
 

diff --git a/README.md b/README.md
@@ -14,7 +14,7 @@ This repository contains the code for useiti.doi.gov, which is a website that in
 
 ## Why
 
-This effort was announced as part of President Obama’s [Open Government Partnership National Action Plan](http://www.whitehouse.gov/blog/2013/12/06/united-states-releases-its-second-open-government-national-action-plan), which commits the U.S. to ensuring taxpayers are receiving every dollar due for extraction of the U.S.’s natural resources.
+This effort was announced as part of President Obama’s [Open Government Partnership National Action Plan](https://obamawhitehouse.archives.gov/blog/2013/12/06/united-states-releases-its-second-open-government-national-action-plan), which commits the U.S. to ensuring taxpayers are receiving every dollar due for extraction of the U.S.’s natural resources.
 
 In December of 2013, the U.S. applied to become part of an international standard called the [Extractive Industries Transparency Initiative (EITI)](http://www.eiti.org/). EITI is a global coalition of governments, companies and civil society working together to improve openness and accountable management of revenues from natural resources. For more information on the U.S. process of implementing the EITI standard, see [about USEITI](https://useiti.doi.gov/about/).
 

diff --git a/_case-studies/boone-logan-and-mingo.md b/_case-studies/boone-logan-and-mingo.md
@@ -3,13 +3,13 @@ title: Boone, Logan, and Mingo Counties, West Virginia | Case Studies
 title_display: Boone, Logan, and Mingo Counties, West Virginia
 description: The U.S. possesses the largest estimated recoverable coal reserves in the world. This resource abundance allowed coal to serve as the single largest source of domestic electricity generation for more than six decades. However, coal production has declined since 2007 due to increased competition from natural gas, as well as the effects of recent federal regulations.
 tag:
-- local
-- case study
+- Local
+- Case study
 - Boone county
 - Logan county
 - Mingo county
 - West Virginia
-- coal
+- Coal
 layout: content
 permalink: /case-studies/boone-logan-and-mingo/
 resource: coal

diff --git a/_case-studies/campbell.md b/_case-studies/campbell.md
@@ -3,11 +3,11 @@ title: Campbell County, Wyoming | Case Studies
 title_display: Campbell County, Wyoming
 description: Most of the coal consumed in the U.S. fuels the country’s electricity needs, and coal constitutes 39% of all electricity generated in the U.S. Wyoming leads domestic coal production, accounting for two-fifths of the nation’s output. More coal is extracted in Wyoming than in the next four largest coal-producing states combined, with nine of the nation’s ten largest mines located in the state. Campbell County, in the northeast corner of the state, supplies more coal for generating electricity than any other county in the nation.
 tag:
-- local
-- case study
+- Local
+- Case study
 - Campbell county
 - Wyoming
-- coal
+- Coal
 layout: content
 permalink: /case-studies/campbell/
 resource: coal

diff --git a/_case-studies/default.md b/_case-studies/default.md
@@ -3,9 +3,9 @@ title: Case Studies
 layout: case-studies-landing
 description: While extractive industries made up 2.6% of the U.S. GDP in 2013, they play a much larger role in some local communities. For example, extractive industries make up more than a third of Wyoming’s GDP. At the county level, certain communities may be even more economically dependent on extractive industries.
 tag:
-- local
-- case studies
-- revenue sustainability
+- Local
+- Case studies
+- Revenue sustainability
 permalink: /case-studies/
 nav_items:
   - name: title

diff --git a/_case-studies/desoto.md b/_case-studies/desoto.md
@@ -3,11 +3,11 @@ title: DeSoto Parish, Louisiana | Case Studies
 title_display: DeSoto Parish, Louisiana
 description: For years, natural gas production in the Haynesville Shale in the southern U.S. was too difficult and costly. However, in the mid- to late-2000s, advances in hydraulic fracturing and horizontal drilling techniques, as well as rising natural gas prices, made extracting natural gas in the region both technically feasible and profitable for the extractive industries.
 tag:
-- local
-- case study
+- Local
+- Case study
 - Desoto parish
 - Louisia
-- natural gas
+- Natural gas
 layout: content
 permalink: /case-studies/desoto/
 resource: gas

diff --git a/_case-studies/elko-and-eureka.md b/_case-studies/elko-and-eureka.md
@@ -3,12 +3,12 @@ title: Elko and Eureka Counties, Nevada | Case Studies
 title_display: Elko and Eureka Counties, Nevada
 description: Gold is a precious mineral highly valued for its durability and beauty. Used to make jewelry and art, it also has technological uses, such as memory chip conductors and reflective satellite coverings. In 2015, the U.S. was the fourth-largest producer of gold, extracting 200 tons valued at $7.6 billion. The U.S. gold reserves, with an estimated size of 3,000 tons, are the fifth largest in the world. Nevada accounts for 74% of total U.S. gold production.
 tag:
-- local
-- case study
+- Local
+- Case study
 - Elko county
 - Eureka county
 - Nevada
-- gold
+- Gold
 layout: content
 permalink: /case-studies/elko-and-eureka/
 resource: gold

diff --git a/_case-studies/greenlee.md b/_case-studies/greenlee.md
@@ -3,11 +3,11 @@ title: Greenlee County, Arizona | Case Studies
 title_display: Greenlee County, Arizona
 description: Copper is a major industrial metal used in construction, electronics, transportation, industrial machinery, and consumer products. In 2014, the U.S. was the world’s fourth-largest copper producer, mining 1.127 million tons of copper worth a total value of approximately $9.7 billion. Of the five major copper-producing states (Arizona, Utah, New Mexico, Nevada, and Montana), Arizona increased production most in 2014. Arizona's copper output totaled 893,000 metric tons, or 66% of the national total. Copper represented 89% of the total value of mining in Arizona, with Greenlee and Pima counties generating the majority of that production. If Arizona were a country, it would be the seventh largest copper producer in the world.
 tag:
-- local
-- case study
-- greenlee county
+- Local
+- Case study
+- Greenlee county
 - Arizona
-- copper
+- Copper
 layout: content
 permalink: /case-studies/greenlee/
 resource: copper

diff --git a/_case-studies/humbolt-and-lander.md b/_case-studies/humbolt-and-lander.md
@@ -3,12 +3,12 @@ title: Humbolt and Lander Counties, Nevada | Case Studies
 title_display: Humbolt and Lander Counties, Nevada
 description: Gold is a precious mineral highly valued for its durability and beauty. Used to make jewelry and art, it also has technological uses such as memory chip conductors and reflective satellite coverings. In 2015, the U.S. was the fourth largest producer of gold, extracting 200 tons valued at $7.6 billion. The U.S. gold reserves, with an estimated size of 3,000 tons, are the fifth largest in the world. The Great Basin, located primarily in Nevada, accounts for 74% of total U.S. gold production.
 tag:
-- local
-- case study
+- Local
+- Case study
 - Humbolt county
 - Lander county
 - Nevada
-- gold
+- Gold
 layout: content
 permalink: /case-studies/humboldt-and-lander/
 resource: gold
@@ -81,12 +81,12 @@ The table below highlights the data sources used to compile this narrative, as w
 
 This case study is current as of August 2016. Many data sources are updated regularly, and may show more recent figures than are included here.
 
-<table>
+<table class="article_table">
   <thead>
     <tr>
-      <td>Measure</td>
-      <td>Data availability</td>
-      <td>Data gaps</td>
+      <th>Measure</th>
+      <th>Data availability</th>
+      <th>Data gaps</th>
     </tr>
   </thead>
   <tbody>

diff --git a/_case-studies/kern.md b/_case-studies/kern.md
@@ -3,11 +3,11 @@ title: Kern County, California | Case Studies
 title_display: Kern County, California
 description: Kern County is situated in the southernmost region of the San Joaquin Valley, in California’s interior. While Kern County has significant deposits of many resources — including natural gas, geothermal steam, wind, gold, and other minerals — oil in particular has shaped Kern County’s local economy for over a century.
 tag:
-- local
-- case study
+- Local
+- Case study
 - Kern county
 - California
-- oil
+- Oil
 layout: content
 permalink: /case-studies/kern/
 resource: oil

diff --git a/_case-studies/marquette.md b/_case-studies/marquette.md
@@ -3,11 +3,11 @@ title: Marquette County, Michigan | Case Studies
 title_display: Marquette County, Michigan
 description: Iron ore is the primary mineral substance for the world’s iron and steel industries. Michigan is the second-largest producer of iron ore in the country behind Minnesota. All of Michigan’s iron-production operations are located in the northern reaches of the state, in Marquette County.
 tag:
-- local
-- case study
+- Local
+- Case study
 - Marquette county
 - Michigan
-- iron
+- Iron
 layout: content
 permalink: /case-studies/marquette/
 resource: iron

diff --git a/_case-studies/north-slope.md b/_case-studies/north-slope.md
@@ -3,11 +3,13 @@ title: 'North Slope Borough, Alaska | Case Studies'
 title_display: 'North Slope Borough, Alaska'
 description: The U.S. has experienced rapid change in domestic oil production since 2008, when crude oil production reached a low of 3.98 million bbl per day. Just five years later, the U.S. had nearly doubled its daily production output, with Texas and North Dakota driving much of the growth. Alaska did not experience the same production boom, with crude oil output steadily declining over the past decade. In spite of that downward trend, Alaska remained  the fourth largest state producer of crude oil in 2015, and the nation's largest oil-producing county is Alaska's North Slope Borough.
 tag:
-- local
-- case study
-- North Slope borough
+- Local
+- Case study
+- North
+- Slope
+- Borough
 - Alaska
-- oil
+- Oil
 layout: content
 permalink: /case-studies/north-slope/
 resource: oil

diff --git a/_case-studies/pima.md b/_case-studies/pima.md
@@ -3,11 +3,11 @@ title: 'Pima County, Arizona | Case Studies'
 title_display: 'Pima County, Arizona'
 description: Copper is a major industrial metal used in construction, electronics, transportation, industrial machinery, and consumer products. In 2014, the U.S. was the world's fourth-largest copper producer, mining 1.13 million tons of copper worth approximately $9.7 billion. Of the five major copper-producing states (Arizona, Utah, New Mexico, Nevada, and Montana), Arizona increased production the most in 2014; its copper output totaled 893,000 metric tons, representing 66% of the national total. Copper represented 89% of the value of mining in Arizona. If Arizona were a country, it would be the seventh-largest copper producer in the world. Greenlee and Pima counties generated the majority of that production.
 tag:
-- local
-- case study
+- Local
+- Case study
 - Pima county
 - Arizona
-- copper
+- Copper
 layout: content
 permalink: /case-studies/pima/
 resource: copper

diff --git a/_case-studies/st-louis.md b/_case-studies/st-louis.md
@@ -3,11 +3,11 @@ title: 'St. Louis County, Minnesota | Case Studies'
 title_display: 'St. Louis County, Minnesota'
 description: "Iron ore is the primary mineral substance for the world's iron and steel industries. The U.S. is estimated to possess iron ore reserves of 110 billion tons, which can produce approximately 27 billion tons of metallic iron. In 2014, the U.S. was the world's eighth-largest producer of iron ore, generating an output of 57 million metric tons. 93% of usable iron ore was produced in Michigan and Minnesota, with an estimated value of $5 billion. In 2013, more than three-fourths of that output came from iron mines located in a single area of Minnesota: St. Louis County."
 tag:
-- local
-- case study
+- Local
+- Case study
 - St. Louis county
 - Minnesota
-- iron
+- Iron
 layout: content
 permalink: /case-studies/st-louis/
 resource: iron

diff --git a/_case-studies/tarrant-and-johnson.md b/_case-studies/tarrant-and-johnson.md
@@ -4,11 +4,11 @@ title_display: Tarrant and Johnson Counties, Texas
 description: Texas leads the country in natural gas production. Tarrant and Johnson counties contribute significantly to Texas’s natural gas production due to their geographic positioning atop the rich reserves of the Barnett Shale field in the Bend Arch-Fort Worth Basin.
 tag:
 - local
-- case study
+- Case study
 - Tarrant county
 - Johnson county
 - Texas
-- natural gas
+- Natural gas
 layout: content
 permalink: /case-studies/tarrant-and-johnson/
 resource: gas

diff --git a/_data/national_revenues.yml b/_data/national_revenues.yml
@@ -116,7 +116,7 @@ US:
       '2013': 398222783
       '2014': 475418540
       '2015': 179655789
-    None:
+    Non-commodity revenue:
       '2006': -2097277
       '2007': 4286771
       '2008': 2290084

diff --git a/_data/opt_in_state_revenues/WY.yml b/_data/opt_in_state_revenues/WY.yml
@@ -1,7 +1,7 @@
 streams:
   All:
     Total:
-      '2015': 2973921214
+      '2015': 3169341371
     Cities/Towns/Counties:
       '2015': 1038379517
     Legislative Royalty Impact Assistance Account / Budget Reserve:
@@ -14,7 +14,7 @@ streams:
       '2015': 228955844
     General Fund:
       '2015': 215654798
-    Permanent Land Funds (largely benefitting Common School):
+    Permanent Land Funds (largely benefitting Common Schools):
       '2015': 196753056
     WY Highway Fund:
       '2015': 68729000
@@ -24,7 +24,7 @@ streams:
       '2015': 19297500
     Capital Construction Account:
       '2015': 16661500
-    Permanent Land Income Funds (largely benefitting Common School):
+    Permanent Land Income Funds (largely benefitting Common Schools):
       '2015': 15668838
     University of Wyoming:
       '2015': 13365000
@@ -47,7 +47,7 @@ streams:
       '2015': 996807296
   Severance Tax:
     Total:
-      '2015': 786564004
+      '2015': 981984161
     Permanent Mineral Trust Fund:
       '2015': 308438273
     General Fund:
@@ -105,9 +105,9 @@ streams:
   State Royalties (In-Scope Commodities):
     Total:
       '2015': 222220146
-    Permanent Land Funds (largely benefitting Common School):
+    Permanent Land Funds (largely benefitting Common Schools):
       '2015': 196753056
-    Permanent Land Income Funds (largely benefitting Common School):
+    Permanent Land Income Funds (largely benefitting Common Schools):
       '2015': 15668838
     School District Capital Construction:
       '2015': 8000000
@@ -128,11 +128,11 @@ streams:
 funds:
   Total:
     All:
-      '2015': 2973921214
+      '2015': 3169341371
     Ad Valorem Taxes:
       '2015': 996807296
     Severance Tax:
-      '2015': 786564004
+      '2015': 981984161
     Federal Mineral Royalties:
       '2015': 689273387
     Federal Coal Lease Bonuses:
@@ -191,7 +191,7 @@ funds:
       '2015': 1798252
     Wind Generation Tax:
       '2015': 1772147
-  Permanent Land Funds (largely benefitting Common School):
+  Permanent Land Funds (largely benefitting Common Schools):
     State Royalties (In-Scope Commodities):
       '2015': 196753056
     All:
@@ -224,7 +224,7 @@ funds:
       '2015': 5625000
     Severance Tax:
       '2015': 3611500
-  Permanent Land Income Funds (largely benefitting Common School):
+  Permanent Land Income Funds (largely benefitting Common Schools):
     State Royalties (In-Scope Commodities):
       '2015': 15668838
     All:

diff --git a/_data/search.yml b/_data/search.yml
@@ -550,14 +550,14 @@
   - Partnership
 
 - title: White House-National Action Plan
-  url: https://www.whitehouse.gov/sites/default/files/us_national_action_plan_final_2.pdf
+  url: https://obamawhitehouse.archives.gov/sites/default/files/us_national_action_plan_final_2.pdf
   description: " The White House, The Open Government Partnership: National Action Plan for the United States of America, September 20, 2011"
   tag:
   - Action
   - Plan
 
 - title: White House Second National Action Plan
-  url: https://www.whitehouse.gov/sites/default/files/docs/us_national_action_plan_6p.pdf
+  url: https://obamawhitehouse.archives.gov/sites/default/files/docs/us_national_action_plan_6p.pdf
   description: " The White House, The Open Government Partnership: Second Open Government National Action Plan for the United States of America"
   tag:
   - Action
@@ -1805,7 +1805,7 @@ Reform; Proposed Rule"
   - Tax
 
 - title: "The White House, Fiscal Year 2016 Mid-Session Review: Budget of the U.S. Government, Table S 8, Mandatory and Receipt Proposals"
-  url: https://www.whitehouse.gov/sites/default/files/omb/budget/fy2016/assets/16msr.pdf
+  url: https://obamawhitehouse.archives.gov/sites/default/files/omb/budget/fy2016/assets/16msr.pdf
   description: "Mid-Session review of US budget"
   tag:
   - Budget
@@ -2202,7 +2202,7 @@ mineral leases."
   - Consumption
 
 - title: "U.S. Office of Management and Budget, Summary of Receipts, Outlays, and Surpluses or Deficits: 1789 to 2020"
-  url: http://www.whitehouse.gov/omb/budget/Historicals
+  url: https://obamawhitehouse.archives.gov/omb/budget/Historicals
   description: "Historical Tables provides data on budget receipts, outlays, surpluses or deficits, Federal debt, and Federal employment over an extended time period, generally from 1940 or earlier to 2016 or 2020."
   tag:
   - OMB
@@ -4090,7 +4090,7 @@ with respect to projected revenues, resources, accrued equities, and expenditure
   - Improvement
 
 - title: The Office of Management and Budget, OMB Circular 123
-  url: https://www.whitehouse.gov/omb/circulars_a123_rev
+  url: https://obamawhitehouse.archives.gov/omb/circulars_a123_rev
   description: "OMB Circular No. A-123 defines management's responsibility for internal control in Federal agencies. A re-examination of the existing internal control requirements for Federal agencies was initiated in light of the new internal control requirements for publicly-traded companies contained in the Sarbanes-Oxley Act of 2002. Circular A-123 and the statute it implements, the Federal Managers’ Financial Integrity Act of 1982, are at the center of the existing Federal requirements to improve internal control"
   tag:
   - OMB
-Original file line number
+Diff line change
@@ Expand Up @@
     ## Why
-    This effort was announced as part of President Obama’s [Open Government Partnership National Action Plan](http://www.whitehouse.gov/blog/2013/12/06/united-states-releases-its-second-open-government-national-action-plan), which commits the U.S. to ensuring taxpayers are receiving every dollar due for extraction of the U.S.’s natural resources.
+    This effort was announced as part of President Obama’s [Open Government Partnership National Action Plan](https://obamawhitehouse.archives.gov/blog/2013/12/06/united-states-releases-its-second-open-government-national-action-plan), which commits the U.S. to ensuring taxpayers are receiving every dollar due for extraction of the U.S.’s natural resources.
     In December of 2013, the U.S. applied to become part of an international standard called the [Extractive Industries Transparency Initiative (EITI)](http://www.eiti.org/). EITI is a global coalition of governments, companies and civil society working together to improve openness and accountable management of revenues from natural resources. For more information on the U.S. process of implementing the EITI standard, see [about USEITI](https://useiti.doi.gov/about/).
@@ Expand Down @@