Merge pull request #360 from euanh/build-improvements

Add xcp-python-libs, required by linux-guest-loader, and tidy up.