Merge branch 'master' into release

Author: kbarnhart

joss/paper.bib

@@ -83,7 +83,7 @@ @article{schwanghart2010topo
     pages = {770 - 781},
     year = {2010},
     issn = {1364-8152},
-    doi = {https://doi.org/10.1016/j.envsoft.2009.12.002}
+    doi = {10.1016/j.envsoft.2009.12.002}
     }
 
 @Article{	  perron2013integral,
@@ -94,5 +94,6 @@ @Article{	  perron2013integral
     publisher	= {Wiley Online Library},
     title		= {An integral approach to bedrock river profile analysis},
     volume	= {38},
-    year		= {2013}
+    year		= {2013},
+    doi = {10.1002/esp.3302}
   }

joss/paper.md

@@ -58,6 +58,6 @@ Second, the `discretized_misfit` calculation seeks to reduce the dimension of a
 
 # Acknowledgements
 
-Support for this work was provided by an NSF EAR  Postdoctoral Fellowship to Barnhart (1725774). Funding for Landlab was provided by NSF (1147454, 1450409). Landlab is additionally supported by the Community Surface Dynamics Modeling System (1226297, 1831623).
+Support for this work was provided by an NSF EAR  Postdoctoral Fellowship to Barnhart (NSF Award Number 1725774). Funding for Landlab was provided by NSF (NSF Award Numbers 1147454 and 1450409). Landlab is additionally supported by the Community Surface Dynamics Modeling System (NSF Award Numbers 1226297 and 1831623).
 
 # References