# Conflicts:
#	util/custom_argparse_types.py
#	visualize_city_emissions.py

* jhkennedy/add-cmip6-data:
  Intersect script now zooms in on cities
  Intersect script now plots city and nn outlines
  Can now plot city outline for intersecting USA cities and top 49
  Remove depreciated custom argparse type
  Add bibtex for cities data

Closes !4

Also:
* Fixes gC to gCO2 compairison bug
* Better plot labels
* Adds PNG figures of this scripts output

Also, using pcolormesh instead of contorf for the global emissions maps
because it better illustrates the data by clearly showing the grid cell
values

Add README and yaml environment description

Closes #8

See merge request !3

Fixes #8

Except, Chicago and Philadelphia for currently unknown reasons

And rename city emissions csv to make it clear pdf, bib, csv go together

* jhkennedy/add-cmip6-data:
  Remove probe script as it's now a class method
  Move grids out of data __init_
  A little reorganization

* jhkennedy/add-cmip6-data:
  Update figures and add save option
  Begin sketching out how to take a city shapefile and extract emissions from the CMIP grids
  Fix CMIP6 datagrid's time handling
  Organize data
  Update CMIP5 preprocessing scripts for new data grid
  All scripts now work with both CMIP5 and CMIP6 data
  Update CMIP5 and CMIP6 emission grids and probe script
  Add CMIP6 data and CMIP6 emissions grid
  Remove ESMGF script that does not work.