Merge branch 'master' of github.com:openconnectome/open-connectome
All tests passing.
Merge branch 'master' into cassandra
Adding riak file.
Changes on wrong machine.
[merge] Merging with Randal's latest push to Cassandra. All tests pass