Merge pull request #153 from euanh/build-improvements

ocaml-xenstore: Mark as conflicting with upstream xen-ocaml package
Merge pull request #154 from euanh/build-improvements

vncterm: Update to latest release in upstream repository