Fix long line in man page
Minor fix to not have run together words in help
Add Tianhe-2 job launch timing info
Update SUG13 info
Merge branch 'slurm-2.6'