-M option on tools talking to a Cray from a non-Cray fixed.
CRAY - Fix rpmbuild issue for missing file slurm.conf.template.
Clarify description of SLurm time format
Add Brian Christiansen to "team" web page
Merge branch 'slurm-14.03'

Conflicts:
	doc/html/faq.shtml