Merge pull request #1268 from OpenMDAO/dev

dev merge
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into dev
Merge branch 'column_sorting' of github.com:crobinsonut/OpenMDAO-Framework into cal
tests
pass