Merge branch 'master' into NEW_EDS_TEM_quantification
TEST: some tests
Automatic style corrections courtesy of autopep8
DOC_STR: improve doc string
Automatic style corrections courtesy of autopep8
Merge branch 'NEW_fast_MAC' into NEW_eds_background_model
Automatic style corrections courtesy of autopep8
EHN: compound MAC

accept weight fraction as list
of float/Signal/list
Merge branch 'NEW_fast_MAC' into NEW_eds_background_model
Merge branch 'NEW_eds_background_model' into NEW_edsModel
Merge branch 'NEW_edsModel' into edslab

Conflicts:
	hyperspy/_signals/eds.py
	hyperspy/misc/eds/utils.py
EHN: compound MAC

accept weight fraction as list
of float/Signal/list
Merge branch 'NEW_fast_MAC' into NEW_eds_background_model
Merge branch 'NEW_eds_background_model' into NEW_edsModel
Merge branch 'NEW_edsModel' into edslab
EHN: get_abs_corr
EHN: tidy up
Merge branch 'NEW_EDS_TEM_quantification' into edslab

Conflicts:
	hyperspy/_signals/eds_tem.py
	hyperspy/misc/eds/utils.py
EHN: tidy up
Merge branch 'NEW_EDS_TEM_quantification' into edslab

Conflicts:
	hyperspy/_signals/eds_tem.py
	hyperspy/misc/eds/utils.py