Expand description of gres CPUs configuration

The CPU specification enforcement is strict rather than advisory.
Fix bad format in last commit
Merge branch 'slurm-14.03'

Conflicts:
	doc/html/gres.shtml
	doc/man/man5/gres.conf.5