Some preliminary streamlinging of Diffusion Analyzer.
Automated merge for py3k testing