Multiple improvements, including aggregations to make the data more usable - merge from branch_v2_5_1plus_ucsd1
Multiple improvements, including aggregations to make the data more usable - merge from branch_v2_5_1plus_ucsd1

holzman/glideinwms-old,holzman/glideinwms-old,holzman/glideinwms-old