Small correction of label for energy in phase diagrams.
Merge branch 'master' of git://github.com/materialsproject/pymatgen
Merge branch 'master' of git://github.com/materialsproject/pymatgen
ESP task added in NWChem
Cosmo
Change StructureMatcher's internal representation of a structure to a large
masked table instead of multiple smaller ones to allow more complicated
Comparator objects (with non-transitive mapping)
Merge branch 'master' into structure_matcher

Conflicts:
	pymatgen/analysis/structure_matcher.py
v2.7.8 release.
added comparator for checking ordered to disordered fits
Merge branch 'structure_matcher' of github.com:materialsproject/pymatgen into structure_matcher
Merge branch 'master' into structure_matcher
Finetune phase diagram imports.
more functional groups
Fix substitution algo.
corrected functional group coord
Adding MV battery compatibility.
 Optional kwargs are now passed to HighSymmKpath.get_kpath_plot + additional conversion tools.
Merge remote-tracking branch 'mpmaster/master'

Conflicts:
	pymatgen/io/abinitio/abiobjects.py
Update version number to 2.7.10b. Update change log.
Add additional unit test for Molecule.substitute.