Fix two tests that were broken for older numpy versions.

This (hopefully) fixes the issue.
Automatic style corrections courtesy of autopep8
Merge branch 'master' of https://github.com/hyperspy/hyperspy
ENH proposal to components.Bleasdale, do not use NaNs, better use zeros
Merge pull request #383 from AEljarrat/fix_bleasdale

ENH: components.Bleasdale: do not use NaNs, better use zeros
Merge branch 'master' of https://github.com/hyperspy/hyperspy
BUG: _get_lines_from_elements 'auto' high energy lines
Test: add a test
Merge branch 'BUG_add_Lines' into edslab

Conflicts:
	hyperspy/_signals/eds.py
EHN: add extra Xray lines in misc.elements
Automatic style corrections courtesy of autopep8
Merge branch 'EHN_elements_database_add_Xray_lines' into edslab

Conflicts:
	hyperspy/misc/elements.py
Merge pull request #384 from pburdet/BUG_add_Lines

Bug add lines
Merge pull request #385 from pburdet/EHN_elements_database_add_Xray_lines

Ehn elements database add xray lines
Merge pull request #377 from francisco-dlp/FIX_tests_fails_round_off_error

Fix tests fails round off error
EHN: interpolate_in_between polyfit and spline
NEW: examples of hyperyp function
Merge branch 'master' into edslab
Merge branch 'master' of https://github.com/hyperspy/hyperspy into EHN_warning_line_ouside_limit
New: _xray_lines_in_range