style upgrades
Merge branch 'master' of https://github.com/derfl0/conversation.git