Make smoothing optional

[sethaxen]

This is the simplest way to achieve the decoupling of diagnostics and smoothing needed for #21.

Edit: corresponding issue is #26