Logging + Misc cleanup

Should we move this to util or a top level 'log' directory?  I can see this being useful elsewhere.