* First commit for 2.6.0 migration
pyslurm/pyslurm.pyx:

 * Job_dict['nodes'] was set 2x and overriden. Already set from _job_ptr

debian/changelog:

 * increased version

setup.py:

 * changed __slurm_hex_version__ check to allow 2.5.xx
Merge pull request #30 from waxie/slurm-2.5

Fix for issue #29
Merge branch 'slurm-2.5'

Conflicts:
	setup.py
Merge branch 'slurm-14.11'

Conflicts:
	README.rst
	pyslurm/__init__.py
	pyslurm/pyslurm.pyx
	setup.py
Resolve conflict
Added Waxie and changed order to be Alphabetical
Resolve confict on failed merge