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
Merge branch 'master' of https://github.com/gmatteo/pymatgen

Conflicts:
	pymatgen/io/abinitio/abiobjects.py
	pymatgen/io/abinitio/launcher.py
Revert change with max_jobs_running
Merge pull request #13 from yanikou19/master

Syntax error for ngkpt in Ksampling