Changes from SISU to SLURM stuff
Merge branch 'master' of git://github.com/xapple/plumbing

Conflicts:
	plumbing/runner.py