rm import from matplotlib
Merge branch 'xrf_fit'