Issue #116: Update Makefiles to support VHPI, bugfixes to VHPI shim