Two small fixes.

Respect watermark= attribute.
use staticfiles "find" and not STATIC_ROOT.