Implement Tom's requested changes to message formats
Merge pull request #8 from guardian/pushy-124-message-content

Implement Tom's requested changes to message formats