Lots of photomasking changes

Now outputs individual contributor masks labelled by userid
Fixed handling of polygon holes.
No thresholded masking anymore.