Rename some variables in select/linear, no change in logic
Refactoring of Cray NPPCU logic, simpler code
Merge branch 'slurm-2.5'

Conflicts:
	src/slurmctld/job_mgr.c
Fix sched/backfill logic for min/max time limit and part limit

Fix sched/backfill logic to initiate jobs with maximum time limit over the
partition limit, but the minimum time limit permits it to start.
Related to bug 251
Fix for timing issue in job steps now that slurm is much faster

(at initiating pending job steps), interupt driven rather than
retry based.\
some updates to SUG 2013 info on web page
Add new variables to sview

FrontEndNode: allow/deny groups/users
Node: Power consumption
Add test of srun within an allocation with a hostlist
Fix formatting in new test
Disable srun --pty option unless LaunchType=launch/slurm.

Fix for bug 258
CRAY - Fix sanity check for systems with more than 32 cores per node.
CRAY - Remove other objects from MySQL query that are available from
the XML.
BLUEGENE - Set the geometry of a job when a block is picked and the job
isn't a sub-block job.
Fix Typo
Cray - avoid check of macro versions of CLE for version 5.0.
CRAY - Fix memory issue with reading in the cray.conf file.
CRAY - If hostlist is given with srun make sure the node count is the same
as the hosts given.
CRAY - Set to better variable name and fix issue on reconfig.
CRAY - add missing variable
Merge remote-tracking branch 'origin/slurm-2.5'

Conflicts:
	src/plugins/select/cray/cray_config.c