Merged changes and fixed python xen bindings