Small optimizations to collate
Small optimizations to collate

- The number of 'globs' has been reduced to one per collate. This should reduce the amount of time needed to collate in directories with several files (very large grids).

- Couple more changes to help with the calculation of the disk mass.

cespaillat/EDGE,cespaillat/EDGE