minor revisions to routing code
changes to aggregation scripts, nothing major
merge conflict resolution, chose to use all of remote changes when there was a conflict