ENH: _get_line_energy method
Automatic style corrections courtesy of autopep8
ENH: tidy get_lines
Automatic style corrections courtesy of autopep8
Merge branch 'ENH_eV_or_keV' into edslab

Conflicts:
	hyperspy/_signals/eds.py
Automatic style corrections courtesy of autopep8
ENH: eV to keV following
Automatic style corrections courtesy of autopep8
ENH: add_lines udpate
Automatic style corrections courtesy of autopep8
Test:add test
Automatic style corrections courtesy of autopep8
Merge branch 'ENH_eV_or_keV' into edslab

Conflicts:
	hyperspy/_signals/eds.py
	hyperspy/tests/signal/test_eds_sem.py
Automatic style corrections courtesy of autopep8
BUGFIX: set new result
Automatic style corrections courtesy of autopep8