Small correction of label for energy in phase diagrams.
Merge branch 'master' of git://github.com/materialsproject/pymatgen
Merge branch 'master' of git://github.com/materialsproject/pymatgen
esp_nwchem
add test for nwchemio and fixed bugs
fixed bug in theory_spec
corrected keyword dielectric
added another template for ESP and removed RESP
testing hive
option for cosmo section
changes in job_type
fixed typo
 Add QueueAdapter objects inspired to fireworks + Replace RunMode with TaskManager
 Replace isinstance with duck-type testing
 Code cleanup
 Minor modifications.
 Minor changes.
 Complete interface of QueueAdapters.
 Workaround in workflow.connect()
Merge remote-tracking branch 'origin/solvent_hive'

Conflicts:
	pymatgen/io/nwchemio.py