Fixes related to an NREL model.
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug
Drop extraneous code
Merge pull request #1650 from setowns1/bug

Fixes related to an NREL model