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