Updated to work with the latest clang/llvm head

Hey there

Spent a little time updating things to work with the latest clang/llvm HEAD.  Had to pull out the -c switch which conflicts with clang though.