Add constant smoothing mode for diffusion_analyzer. WIP.
Automatic Py3k merge for testing