Again for Stephan.
Merge branch 'neworg' of github.com:openconnectome/open-connectome into neworg