Merge Logger into Master

The Logger code seems stable enough.  I believe that it's complete enough to be inside master, and the further changes shouldn't be too much.