Debugging merge functionality.
Add exceptions for testing.
Changes to merge
Fixed merge global.  merge2d and 3d have not been touched.
Version run to create lp4clean.
Merge branch 'merge' of github.com:openconnectome/open-connectome into merge

Conflicts:
	ocpca/ocpcadb.py
Minor remove EMCA
Allow nick to choose his channels.  0 channels do nothing in mcfc
Zero channels for color choice in mcfc.
Code used to merge LP4 and MP4.
Script that merged MP4.
Merge branch 'neworg' of github.com:openconnectome/open-connectome into neworg
Merge branch 'neworg' into priya_devel
Updated Django models for ocpuser with new project configuration schema
OCP proj schema updated and datasets complete working
Fix for file handle leakage.  Audit on rio.
Merge branch 'neworg' of github.com:openconnectome/open-connectome into neworg
Merge of file handle fix.wq
Fixed file handle leak for HDF5 files.
This happened when there was an error.  In this case,
the Web server doesn't close the file handle after reading
it and it must be closed explicitly.
Probability maps.