Pretty much a total re-write.
Merge branch 'master' of https://github.com/JasonSwindle/mom

Conflicts:
	files/supervisor/ntpd.conf