Fixing merge

Pulled to sync C9, it re-added all the blog stuff I trimmed.  All better again.