fixed test
Merge branch 'dev' of https://github.com/OpenMDAO/OpenMDAO-Framework into dev
bug fix for math mistake in expected_improvement
Merge pull request #1679 from JustinSGray/dev