uncommenting out the go-file changes that had been commented out
small change to chromedriver note
Merge branch 'dev' into gui
New recording API, updated recorders.
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug

Conflicts:
	openmdao.lib/src/openmdao/lib/casehandlers/dumpcase.py
	openmdao.lib/src/openmdao/lib/casehandlers/test/test_datadump.py
Merge branch 'gui' of github.com:swryan/OpenMDAO-Framework into gui
Constant recording.
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug

Conflicts:
	openmdao.gui/src/openmdao/gui/test/functional/test_dataflow.py
More recording updates.
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug
Update json encoder to handle ndarray.
Include assembly inputs & outputs in recording configuration.
Merge branch 'dev' into gui
update pangolin image to one with chrome v35
Drop width from recording configuration.
Merge branch 'dev' into gui
Merge branch 'dev' of github.com:OpenMDAO/OpenMDAO-Framework into bug

Conflicts:
	openmdao.gui/src/openmdao/gui/test/functional/test_dataflow.py
	openmdao.gui/src/openmdao/gui/test/functional/test_slots.py
	openmdao.gui/src/openmdao/gui/test/functional/test_workspace.py
	openmdao.lib/src/openmdao/lib/casehandlers/test/test_datadump.py
	openmdao.main/src/openmdao/main/assembly.py
	openmdao.main/src/openmdao/main/workflow.py
Merge branch 'dev' of http://www.github.com/OpenMDAO/OpenMDAO-Framework into dev
Better error handing during recording.
skip javascript testing for chrome version > 34