Map ocaml-vhd to vhd-ocaml
Merge branch 'key-error-fix' into mate-fixing-xsc