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