Remove support for scipy.io.netcdf (Netcdf4 is now required by abinitio)
 Remove ape.py (ppdojo will become a client of APE)
Merge remote-tracking branch 'mpmaster/master'
Merge remote-tracking branch 'mpmaster/master' (fix conflict with ape.py, removed)

Conflicts:
	pymatgen/io/abinitio/ape.py