EHN: Xray energy from Chantler2005
EHN: factor to weight
Automatic style corrections courtesy of autopep8
EHN: _get_energy_xray_line
Automatic style corrections courtesy of autopep8
EHN: eds._get_line_energy
Merge branch 'ENH_beam_energy_units' into EHN_tidy_energy
Merge branch 'EHN_tidy_energy' into edslab
Merge branch 'EHN_energy_database' into edslab

Conflicts:
	hyperspy/misc/elements.py
MERGE: factor->weight
Automatic style corrections courtesy of autopep8
NEW: python_tricks
Automatic style corrections courtesy of autopep8
ENH: examples for quant TEM
Automatic style corrections courtesy of autopep8
BUG: EDS TEM missing_parameters()
Merge pull request #320 from pburdet/BUG_eds_tem_missing_parameters

BUG: EDS TEM missing_parameters()
Merge branch 'master' into edslab
EHN: get_density
Automatic style corrections courtesy of autopep8