changed model test so that it passes with new numpy / scipy
Gitignore pyd
removed commented old lines
Merge pull request #376 from to266/BUGFIX_model_tests_new_scipy

Bugfix model tests new scipy
Merge branch '0.7.x'
Merge branch 'master' of https://github.com/hyperspy/hyperspy
Instruct git to ignore pycharm project folder.
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