Fix Typo
Add note about --launcher-opts in bluegene html page
Tagging 2.5.5
Merge remote-tracking branch 'origin/slurm-2.5'

Conflicts:
	META