Pick up fixes to interval scaling:

Fix scaling to sum the entire interval instead of 15-minute segments.
Now when you run its output through the script again, you get the
same thing back.

More aggressive duplicate trimming
since it's so hard to keep the source files unique