lint
Merge branch 'gui' of github.com:swryan/OpenMDAO-Framework into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui
fix for get_dataflow with cyclic workflow
add name to workflow trace
Merge branch 'dev' into gui
Merge branch 'dev' into gui
Merge branch 'dev' into gui

FIXED Conflicts:
	openmdao.main/src/openmdao/main/workflow.py
Merge branch 'dev' into gui
stuff