I am trying to commit some stuff
Merge branch 'master' of https://github.com/materialsproject/pymatgen
Commit me!
Merge branch 'master' of https://github.com/materialsproject/pymatgen
Added spb.py to electronic_structure
Allows boltztrap data to be compared to the band model
Updated SPB model for multiple bands (in progress)
Merge branch 'master' of https://github.com/materialsproject/pymatgen
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pymatgen/electronic_structure/boltztrap.py
	pymatgen/electronic_structure/tests/test_boltztrap.py
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
Syntax error for ngkpt in Ksampling
Add tunable max_nlaunch and max_jobs_running for the scheduler and rapidfire
Merge branch 'master' of https://github.com/gmatteo/pymatgen
MPBSHSE fromdict and todict
LOPTICS ...
Merge branch 'master' of https://github.com/materialsproject/pymatgen
user_incar_settings in MPBSHSEVaspInputSet ...