Minor tweaks.
MOre minor tweaks.
Update changelog. Increase major version number due to significant ABINIT update
from Matteo Giantomassi.
Fix unittests.
Minor cleanup.
Skip netcdf tests for now.
Add back Si2_GSR file.
Merge branch 'master' of https://github.com/gmatteo/pymatgen

Conflicts:
	pymatgen/io/abinitio/tests/test_netcdf.py
Use unittest.skipIf decorator instead of nose.exc SkipTest for skipping tests.
Much cleaner.
More unittest cleanup.