gradient_options added
still need to fix gui tests
Merge branch 'dev' of https://github.com/OpenMDAO/OpenMDAO-Framework into settings
oops
Support array parameter reconfiguration.
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug
Merge pull request #1542 from setowns1/bug

Support array parameter reconfiguration
fixing a duplicated line typo in filewrapper_plugin.rst
Merge branch 'dev' of http://github.com/OpenMDAO/OpenMDAO-Framework into dev
Merge pull request #1543 from kmarsteller/dev

Typo fix
MetaModel support for property traits
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug
Merge pull request #1544 from setowns1/bug

MetaModel support for property traits
Support ArrayParameter reconfiguration from initally empty array.
Merge pull request #1545 from setowns1/bug

Support ArrayParameter reconfiguration from initally empty array.
conflict
settings implemented
more tests pass
probably all works
pass