Removed useless import in test_netcdf
 Cosmetic changes.
Merge remote-tracking branch 'mpmaster/master'

Conflicts:
	pymatgen/util/testing.py
Merge remote-tracking branch 'mpmaster/master'
smart_element_or_specie: avoid type-checking, call Element.from_Z if str(obj) represents an integer
Merge remote-tracking branch 'mpmaster/master'
Add very basic unittest for DiffusionAnalyzer.
Merge branch 'master' of https://github.com/gmatteo/pymatgen
Add unittest for smart_element_or_specie.