* Ensure `common.sls` references correct template filename * Use `pillar.get(...)` for message_do_not_modify with default
* Re-organize according to http://docs.saltstack.com/topics/conventions/formulas.html#writing-formulas