Add VMTRACE to user defined vm test

Conflicts:
	test/vm.cpp
VMTRACE for internal calls

Conflicts:
	test/vm.cpp
log VMTRACE in file for user defined test
Merge remote-tracking branch 'upstream/develop' into vmtrace
Update vm.cpp
Update vm.h
Merge pull request #431 from CJentzsch/vmtrace

Adding VMTRACE to user defined vm tests