fix broken G+ images

Ok, so actually just remove them if one is not in the most obvious place.

I loathe nested data structures.
Template&addContext() takes a Template

s/template/context/

Should have tested this.
add Renderable interface, use it for Template
Merge branch 'master' into endicia_7