Allow watermark / overlays / composite images

[michelalbers]

It would be nice to have an option to produce composite images with a watermark overlay. I'm currently using a little nodejs server to do that.

[andrieslouw]

Maybe someone can write this together with #252? So it is possible to use an user-supplied mask/overlay? I don't think we have the resources (time+testing) now to do this.