resolved conflictes after the new push upstream

Author: cheginit

.coveragerc

@@ -1,7 +1,11 @@
 # Contributing
 
 Contributions are welcomed from anyone, including posting issues or
-submitting pull requests to the [pyro github](https://github.com/zingale/pyro).
+submitting pull requests to the [pyro github](https://github.com/python-hydro/pyro).
+
+Users who make significant contributions will be listed as developers
+in the pyro acknowledgements and be included in any future code
+papers.
 
 ## Issues
 

.flake8

@@ -1,4 +1,4 @@
-Copyright (c) 2013-14, Michael Zingale 
+Copyright (c) 2013-18, pyro development team
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

.gitignore

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/zingale/pyro2.svg?branch=master)](https://travis-ci.org/zingale/pyro2)
+[![Build Status](https://travis-ci.com/python-hydro/pyro2.svg?branch=master)](https://travis-ci.com/python-hydro/pyro2)
 
 ![pyro logo](www/logo.gif)
 
@@ -14,12 +14,12 @@ methods.
 
 The latest version of pyro is always available at:
 
-https://github.com/zingale/pyro2
+https://github.com/python-hydro/pyro2
 
 The project webpage, where you'll find documentation, plots, notes,
 etc. is here:
 
-http://zingale.github.io/pyro2/
+http://python-hydro.github.io/pyro2/
 
 
 ## Table of Contents
@@ -96,12 +96,12 @@ http://zingale.github.io/pyro2/
 The main data structures that describe the grid and the data the lives
 on the grid are described in a jupyter notebook:
 
-https://github.com/zingale/pyro2/blob/master/mesh/mesh-examples.ipynb
+https://github.com/python-hydro/pyro2/blob/master/mesh/mesh-examples.ipynb
 
 Many of the methods here rely on multigrid.  The multigrid solver is
 demonstrated in the juputer notebook:
 
-https://github.com/zingale/pyro2/blob/master/multigrid/multigrid-examples.ipynb
+https://github.com/python-hydro/pyro2/blob/master/multigrid/multigrid-examples.ipynb
 
 
 ## Solvers