Better default labels
Merge branch 'master' of https://github.com/ctn-waterloo/nengo_gui

Conflicts:
	nengo_gui/javaviz/javaviz.py