config-matching cleanups, and support for overlays.
Better formatting for thub composite selectors.
Merge branch 'master' of github.com:dasmoth/dalliance
pennantIcon support in track-hubs.
WIP toggleable track-adder.
Merge remote-tracking branch 'upstream/master'