Various Documentation updates
Add pam_slurm.so to faq example
Updates to plugin descriptions
Merge branch 'slurm-2.5'

Conflicts:
	doc/html/news.shtml