Created the environment variable SLURM_JOB_NUM_NODES for srun jobs and
updated the srun man page.
BLUEGENE/CRAY - Don't set env variables that pertain to a node when Slurm
isn't doing the launching.
BLUEGENE/CRAY - Don't set env variables that pertain to a node when Slurm
isn't doing the launching.
Had wrong check
Added "qrerun" command to torque package
minor restructuring of qrerun command
Add qalter command to torque package
Corrections to qstat logic

job CPU count not loaded correctly
Partition time limit format wrong (minutes rather than hhmmss format).
Merge branch 'slurm-2.6'

Conflicts:
	src/common/env.c
Modify qsub wrapper to match torque command

just print the job ID rather than "Submitted batch job #"