remove some duplicated code
Merge pull request #335 from jessereynolds/329_message_templating

Message templating and rollup
Merge branch 'master' into 326_expose_rollup_status_web_ui