Complete
small change
conflict was only a cosmetic fix
Tests pass
cleanup
Merge pull request #1339 from Kenneth-T-Moore/array

Fixed a couple of problems with the Array Custom Editor
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into geom_integration