Merge branch 'master' into new-url

Conflicts:
	licenses.md

Author: konklone

Diff for: catalog.md

@@ -61,6 +61,14 @@ Inclusion of the Public Data Listing as a Record
 
 Each 'data.json' catalog file should include a record for the data asset that is the data catalog itself.  Contact Name and Contact Email can be used to provide a PoC for the 'data.json' efforts;  Data Standard (_conformsTo_) can be used to clarify which version of the Project Open Data metadata schema the agency is currently using; and Last Update can be used to indicate the date when the Public Data Listing was last modified.  
 
+
+Including Non-Public Data and Redactions
+----------------------------------------
+
+While the Public Data Listing is primarily intended to list datasets thare are (or will be) available for public download, it can also serve as a way to publish information about non-public datasets and to provide information about accessing "restricted public" datasets. Data.gov provides a label to distinguish the `accessLevel` of datasets so that the public is aware that non-public dataset listings are only intended to provide metadata rather than access to the data itself. Metadata listings of non-public datasets on agency websites should also make this distinction clear. 
+
+If an agency's FOIA office determines that any metadata provided for these non-public datasets needs to be redacted in order to be displayed publicly, agencies should consult the [Redaction Guidance](/redactions) page for more information. 
+
 Presentation
 ------------
 

Diff for: chief-data-officers.md

@@ -11,24 +11,31 @@ Chief Data Officers
 The Chief Data Officer is an emerging role in US federal government. 
 
 {: .table .table-striped}
-CFO Act Agencies                                |  Chief Data Officer                 
---------------                                  | --------------        
-Department of Agriculture                       | Bobby Jones, Acting
-Department of Commerce                          | Lynn Overmann, Deputy CDO 
-Department of Defense                           |
-Department of Education                         |
-Department of Energy                            | Dave Dutton
-Department of Health and Human Services         |
-Department of Homeland Security                 |
-Department of Housing and Urban Development     |
-Department of Justice                           |
-Department of Labor                             |
-Department of State                             |
-Department of the Interior                      |                
-Department of the Treasury                      |
-Department of Transportation                    | Daniel Morgan                  
-Department of Veterans Affairs                  |
-Environmental Protection Agency                 |
-General Services Administration                 | Kris Rowley
-National Aeronautics and Space Administration   |                
-National Science Foundation                     | 
+CFO Act Agencies                                |  Agency / Bureau                            |  Chief Data Officer             
+--------------                                  | --------------                              | --------------                  
+Department of Agriculture                       |                                             | Bobby Jones, Acting
+Department of Commerce                          |                                             | Ian Kalin
+Department of Defense                           |                                             |
+Department of Education                         |                                             |
+Department of Energy                            |                                             | Dave Dutton
+Department of Health and Human Services         |                                             |
+Department of Health and Human Services         | Centers for Medicare and Medicaid Services  | Niall Brennan
+Department of Homeland Security                 |                                             |
+Department of Homeland Security                 | Federal Emergency Management Agency         | Scott Shoup
+Department of Housing and Urban Development     |                                             |
+Department of Justice                           |                                             |
+Department of Labor                             |                                             |
+Department of State                             |                                             |
+Department of the Interior                      |                                             |                
+Department of the Treasury                      |                                             |
+Department of Transportation                    |                                             | Daniel Morgan                  
+Department of Veterans Affairs                  |                                             |
+Environmental Protection Agency                 |                                             |
+General Services Administration                 |                                             | Kris Rowley
+National Aeronautics and Space Administration   |                                             |               
+National Science Foundation                     |                                             |
+Nuclear Regulatory Commission                   |                                             |
+Office of Personnel Management                  |                                             |
+Small Business Administration                   |                                             |
+Social Security Administration                  |                                             |
+U.S. Agency for International Development       |                                             | Brandon Pustejovsky