nothing to commit

Git is asking me to commit changes, even though I have no changes.  Not
sure what is going on.
Merge branch 'master' of https://github.com/landlab/landlab

Conflicts:
	README.md
	docs/install.rst
	docs/landlab.components.radiation.rst
	docs/manual_index_alt_format.rst
	docs/model_grid.rst
	landlab/components/radiation/radiation_field.py
	landlab/components/soil_moisture/SM_spatial_DEM_PET.py

landlab/components/soil_moisture/examples/soil_moisture_field_example.py
	landlab/components/soil_moisture/soil_moisture_field.py
	landlab/grid/base.py
	landlab/grid/hex.py
	landlab/grid/radial.py
	landlab/grid/raster.py
	landlab/grid/raster_funcs.py
	landlab/grid/tests/test_raster_funcs/test_node_id_of_adjacent.py
	landlab/grid/voronoi.py
	landlab/utils/structured_grid.py
	setup.py