Log aggregation merge review

This is a merge of all 6 of the current open log aggregation PRs.

This PR is half experiment to see if it aids in code review and half an attempt to draw a topographical map in ASCII with `git log --graph --oneline`.