Branch cleanups

Random minor fixes.
Log chat actions in the logger

Recent change to split messages and actions caused actions to stop being
logged.  This fixes that.