cleanup/fix some IR mesh variable names
Merge branch 'overhaul' of darwin:scout into overhaul
fix warnings