Shorter command line options
Adding confl multiplier, changing how depth-averaged usefulness works

We don't use propagation anymore in depth-based. Multiplier also changes
how the confl+prop system works

Also, the confl-depth based had a bug: it compared x to x, not x to y
for == 0 check.