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
Initial commit
Initial restv2 commit.
Update required monty.
add support for closed-shell species NBO charge parsing
Merge remote-tracking branch 'origin/master'
Cleanup.
Merge branch 'master' of github.com:materialsproject/pymatgen
add unit test for simple aimd
Fix XYZ exponetial parsing. Fixes #120.
Merge branch 'master' of github.com:materialsproject/pymatgen
Merge branch 'master' into restv2
Updated MPRester for MAPIv2.
Minor refactoring.