do not set NPAR automatically when running with LEPSILON
Merge branch 'master' of https://github.com/materialsproject/custodian

Conflicts:
	custodian/vasp/jobs.py