Fix examples.
Merge branch 'neworg' of github.com:openconnectome/open-connectome into neworg

Conflicts:
	examples/deprecated/isostacktest.py
Merge branch 'neworg' of github.com:openconnectome/open-connectome into neworg

Conflicts:
	examples/deprecated/isostacktest.py
Reorganize ocp/catmaid for multichannel.