add guards to today's data in cleanup script
Merge branch 'master' into kettle-deployment