Sync.

Added:
  etc.collect
  etc.e
  etc.stdio_nofile

Changed:
  etc.add
  etc.cron_graph_threads
  etc.munin_graph
  etc.sprunge
  etc.trace
  tests.stuff