updated build system
Merge origin/vivisect1 into vivisect1