Outbound logging and hook improvements
Merge with upstream
Fix docs
Fix #691 and fix double-spaces after colon
Merge pull request #689 from smfreegard/master

Misc updates.