Minor code cleanup, and improvements to Message API
Fix travis build
Merge pull request #6 from trevorbernard/master

Fix travis build
Merge pull request #5 from sjohnr/message-api

Minor code cleanup, and improvements to Message API