update to develop branch

Author: browniea

.gitignore

@@ -10,6 +10,7 @@ $ cat .gitignore
 *.tws
 *~
 *.png
+*.index
 
 # Directories
 **/__pycache__/

LICENSE.md

@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2019, Alliance for Sustainable Energy, LLC under the terms of Contract DE-AC36-08GO28308, Battelle Memorial Institute under the terms of Contract DE-AC05-76RL01830, and National Technology & Engineering Solutions of Sandia, LLC under the terms of Contract DE-NA0003525. The U.S. Government retains certain rights in this software. 
+Copyright (c) 2019, Alliance for Energy Innovation, LLC under the terms of Contract DE-AC36-08GO28308, Battelle Memorial Institute under the terms of Contract DE-AC05-76RL01830, and National Technology & Engineering Solutions of Sandia, LLC under the terms of Contract DE-NA0003525. The U.S. Government retains certain rights in this software. 
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

README.md

@@ -84,7 +84,7 @@ See [installation instructions](https://mhkit-software.github.io/MHKiT/installat
 
 ## Copyright and license
 
-MHKiT-Python is copyright through the National Renewable Energy Laboratory,
+MHKiT-Python is copyright through the National Laboratory of the Rockies,
 Pacific Northwest National Laboratory, and Sandia National Laboratories.
 The software is distributed under the Revised BSD License.
 See [copyright and license](LICENSE.md) for more information.