Bump version of munin modules
Swap to non-deprecated behaviour for NTP autoupdate behaviour
Merge yousense:/etc/puppet