first modifications to the substitution_probability and substitutor classes to integrate the whole structure prediction flow in python
Merge branch 'master' of github.com:materialsproject/pymatgen

Conflicts:
	pymatgen/phasediagram/plotter.py