- Added script to merge narrative WS data and narrative access logs
- Added time series data to shock usage
- shock_by_time added.  Not used, but worth keeping around.