Rewrite analyse_snippet
Rewrite analyse_snippet

Test added in previous commit.

Not particularly elegant, but certainly cleaner. re.sub doesn't shine
shell here, an ideal version would use a cross between re.findall and
re.sub such that we could loop.

spywhere/Javatar,spywhere/Javatar