Merge branch 'master' of https://github.com/materialsproject/pymatgen
Merge branch 'master' of https://github.com/materialsproject/pymatgen
Correction of small bug in structure matcher
Merge branch 'master' of https://github.com/materialsproject/pymatgen
MPOpticsNonSCFVaspInputSet
MPOpticsNonSCFVaspInputSet
MPBSHSE fromdict and todict
LOPTICS ...
Merge branch 'master' of https://github.com/materialsproject/pymatgen
user_incar_settings in MPBSHSEVaspInputSet ...
UnitTest for MPOpticsNonSCFVaspInputSet
Merge branch 'master' of https://github.com/materialsproject/pymatgen

Conflicts:
	pymatgen/analysis/structure_matcher.py
Fix unittest.
More fixes to unittests.
allow DictVaspInputSet to force a gamma centered mesh
Remove default NPAR = 1 setting from MIT/MPVaspInputSet. This is no longer
optimal for most machines. (Irrelevant for custodian users since NPAR is
dynamically set).
Remove NPAR for HSE input sets as well.
Fix MAPI link in docs.
More fixes to doc.
Merge remote-tracking branch 'mpmaster/master'