block/image retrieval now defaults to the current site
probably shouldn't be using 'object' as a variable name
strikethrough. no longer defaults to current site
reordered arguments for sanity
rearrange editor tags so we can easily pull bits out for jinja2
upgraded jquery to 1.10.2