Merge pull request #115 from bkeepers/conversation-tweaks

Tweak conversation styles
Merge remote-tracking branch 'origin/master' into commit-info

* origin/master: