Cleaned the doxygen.  Refs #7001.
Removed some debug output.  Refs #7001.
Merge branch 'feature/7001_fit_peak' into develop