Updated ntp.conf template & cleaned up