Add indentation option to incremental_template
Fix collectd python configuration
Merge branch 'master' of github.com:octo-technology/master-chef