[MRG] Unified rendering

This is a fix for https://github.com/scrapinghub/splash/issues/110 + cleanups.

//cc @pablohoffman or @dangra - please merge if it looks ok.