Restructuring source
Merging tumbleweed
Merging tumbleweed
Better log encapsulation. No circular includes.
Better log encapsulation.
Use 'identity' instead of 'hostname' for the different identities
Move fast; break things