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 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
Boltztrap - order switched in from_dict

carrier_conc and dos_partial order was switched in the
electronic_structure.boltztrap.BoltztrapAnalyzer.from_dict method,
remedied this!
Deleted SPB.py
Added SPB back
Merge branch 'master' of https://github.com/materialsproject/pymatgen
Reset back to upstream
Added Boltztrap change  - BoltztrapAnalyzer.from_dict had some arguments in wrong order
Added SPB.py
deleted spb again
Merge branch 'master' of https://github.com/zacharygibbs/pymatgen