clean up, working out impl details for get_attributes api changes
Merge branch 'gui' of github.com:swryan/OpenMDAO-Framework into gui

FIXED Conflicts:
	openmdao.main/src/openmdao/main/container.py
Merge branch 'bug' into gui
disable highlighting of GUI file tree on update (via a preference setting)
Merge branch 'dev' into gui

FIXED Conflicts:
	openmdao.main/src/openmdao/main/component.py
Merge branch 'dev' into gui
Merge pull request #1376 from setowns1/bug

Restored documentation of main/datatypes classes
Merge pull request #1377 from setowns1/bug

Report on retrying install if something failed, pin setuptools version.
disable draw2d's default delete key handling, bug fix
Merge pull request #1378 from swryan/gui

gui - disable DELETE key in dataflow diagram
Edited geometry tutorial again.
Merge pull request #1379 from pziegfeld/redo_geom_edits

Edited geometry tutorial (redo plus additional text from JG).
Windows fix for installing in activated virtualenv.
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug