removed syntax errors by commenting out files
Merge origin/vivisect1 into vivisect1