Add some infrastructure now that a working CLANG build is available
Infrastructure changes
Remove redundant file
Additional file
Code to handle the conversion of non-compound "for" and "if" constructs
into compound statements to make instrumentation more feasible.

Various test cases added