Fixes to simple test harness generator
Make MiniSat compile using recent LLVM
Updated optionst interface