fix runner timing out, and browserify load path
bump version
only return SafeString if template output value contains HTML, resolves #174
merge master, resolve conflicts