Nasty loop for wheezy XenAPI location
useless else
Merge contextlib fix with Wheezy fix
Cleaner approach to find out XenAPI on Debian systems
Removed salt.modules.cmdmod import, use os.popen() instead as we don't have access to __salt__ here
Got rid of os.popen() by calling a helper function from __virtual__
Added vcpu_pin: sets which CPUs a VCPU can use
Merge branch 'develop' of git://github.com/iMilnb/saltstack into iMilnb-develop

Conflicts:
	salt/modules/xapi.py