Rebase fix conflict

Author: lwasser

.github/ISSUE_TEMPLATE/presubmission-inquiry.md

@@ -14,6 +14,9 @@ Repository Link (if existing):
 
 ---
 
+## Code of Conduct & Commitment to Maintain Package
+
+- [ ] I agree to abide by [pyOpenSci's Code of Conduct][PyOpenSciCodeOfConduct] during the review process and in maintaining my package after should it be accepted.
 - [ ]I have read and will commit to package maintenance after the review as per the [pyOpenSci Policies Guidelines][Commitment].
 
 ## Description
@@ -31,14 +34,23 @@ existing community please check below:
 ## Scope 
 
 - Please indicate which [category or categories][PackageCategories] this package falls under:
+
 	- [ ] Data retrieval
 	- [ ] Data extraction
-	- [ ] Data munging
+	- [ ] Data processing/munging
 	- [ ] Data deposition
-	- [ ] Data visualization
-	- [ ] Reproducibility
+	- [ ] Data validation and testing
+	- [ ] Data visualization **
+	- [ ] Workflow automation
+	- [ ] Citation management and bibliometrics
+	- [ ] Scientific software wrappers
+	- [ ] Database interoperability
+
+Domain Specific & Community Partnerships 
+
 	- [ ] Geospatial
 	- [ ] Education
+	- [ ] Pangeo
 	- [ ] Unsure/Other (explain below)
         
 - Explain how and why the package falls under these categories (briefly, 1-2 sentences). Please note any areas you are unsure of:
@@ -65,3 +77,4 @@ existing community please check below:
 
 [pangeoWebsite]: https://www.pangeo.io
 
+[PyOpenSciCodeOfConduct]: https://www.pyopensci.org/governance/CODE_OF_CONDUCT

.github/ISSUE_TEMPLATE/submit-software-for-review.md

@@ -22,13 +22,19 @@ Date accepted (month/day/year): TBD
 
 ---
 
+## Code of Conduct
+
+- [ ] I agree to abide by [pyOpenSci's Code of Conduct][PyOpenSciCodeOfConduct] during the review process and in maintaining my package should it be accepted.
+
 ## Description
 
 - Include a brief paragraph describing what your package does:
 
 
 ## Scope 
-- Please indicate which [category or categories][PackageCategories] this package falls under (If you are unsure of which category you fit, we suggest you make a pre-submission inquiry):
+- Please indicate which category or categories. 
+Check out our [package scope page][PackageCategories] to learn more about our 
+scope. (If you are unsure of which category you fit, we suggest you make a pre-submission inquiry):
 
 	- [ ] Data retrieval
 	- [ ] Data extraction
@@ -56,7 +62,6 @@ existing community please check below:
 
 > ** Please fill out a pre-submission inquiry before submitting a data visualization package.*
 
-
 - **For all submissions**, explain how the and why the package falls under the categories you indicated above. In your explanation, please address the following points (briefly, 1-2 sentences for each):  
 
   - Who is the target audience and what are scientific applications of this package?  
@@ -103,10 +108,6 @@ Confirm each of the following by checking the box.
 - [ ] I have read the [author guide](https://www.pyopensci.org/software-peer-review/how-to/author-guide.html). 
 - [ ] I expect to maintain this package for at least 2 years and can help find a replacement for the maintainer (team) if needed.
 
-## Code of Conduct
-
-- [ ] I agree to abide by [pyOpenSci's Code of Conduct][PyOpenSciCodeOfConduct] during the review process and in maintaining my package should it be accepted.
-
 ## Please fill out our survey
 - [ ] [Last but not least please fill out our pre-review survey](https://forms.gle/F9mou7S3jhe8DMJ16). This helps us track
 submission and improve our peer review process. We will also ask our reviewers