Merge branch 'dev' into gui
Merge branch 'gui' of github.com:swryan/OpenMDAO-Framework into gui