cleanup some skew between scout and llvm/clang, mostly missing scout blocks as such
Merge branch 'overhaul' of darwin:scout into overhaul