Fixed merge annotations bug
Move testing back to rio for Cassandra.
Minor fix for xz service.  Naming conventions and array ordering.
Merged rbdevel
Provide XZ scaling support for catmaid service.

Merge branch 'kl-dev' into rbdevel

Conflicts:
	django/catmaid/simplecatmaid.py
	ocpca/imagecube.py
YZCatmaid
Bounds bug fix for YZCatmaid.
Removed a pdb.
Imagesize boundary fix.
Merge branch 'rbdevel' of github.com:openconnectome/open-connectome into rbdevel

Conflicts:
	ocpca/casskvio.py
	ocpca/ocpcaproj.py
	test/kvengine_to_test.py
	test/test_io.py
	test/test_other.py
	test/test_query.py
	test/test_ramon.py
Move to braingraph for io testing.
Merge of master, kl-dev, and rbdevel that pass unit tests.

Merge branch 'master' into rbdevel-master-merge

Conflicts:
	ocpca/annindex.py
	ocpca/ocpcadb.py
	ocpca/ocpcarest.py
Closing all tmpfiles except those that get returned to django.
Merge remote-tracking branch 'origin/rbdevel' into kl-dev