Update analysis to deal with new data format
oops, didn't mean to turn off aggregation.
Merge branch 'temp-work' into gh-pages