Try to minimize scipy dependency issues.
Merge branch 'master' of github.com:materialsproject/pymatgen
More minor scipy fixes.
Automatic Py3k merge for testing