Minor updates to SUG2013 web pages
Merge branch 'slurm-2.5'