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
Add functionality to Procar class (VASP output) because xml file is hard to read if it is too large.
Merge branch 'master' of https://github.com/materialsproject/pymatgen
Merge branch 'master' of https://github.com/materialsproject/pymatgen
task status update
introducing S_ABICRITICAL and S_QUECRITICAL
Add matgenie option to plot XRD pattern from structure file formats.
Merge branch 'master' of https://github.com/materialsproject/pymatgen
Move is_hexgonal check into lattice.
Vast improvement to how XRDCalc identifies symmetrically equivalent planes.
Also, Miller-Bravais indices now used for hexagonal systems.
Minor speed up.
Minor cleanup.
fix comments
Merge branch 'master' of github.com:materialsproject/pymatgen