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