Update Slurm User Group Meeting info
Minor formatting fix
Accounting - make average by task not cpu.
Merge branch 'slurm-2.5'

Conflicts:
	doc/html/slurm_ug_registration.shtml