First attempt at bringing the repo up-to-date

Also add the Xenstore_watch module from xen-api.git