Template var fix

Resolved issue with SVG image not loading because of a template variable in a verbatim block.

Also contains som un-merged changes from other pull requests, related to Bluebottle tests.