Reduce number of categories, use more generic terms
Merge branch 'master' of https://github.com/munin-monitoring/contrib