Modified CasConsumers and CollectionReaders for new data set dirs.

-jeffgee@cmu.edu