Merge pull request #394 from benlachman/master

Two small design level changes.
Merge pull request #395 from benlachman/master

Changes how message timestamps are displayed.