Nowiki tags now work fully, and minor simplify

Smileys will now never render inside nowiki tags, regardless of what else
is inside the tag

Change-Id: I111420ab3dea2b3060a4c76f1e3622dc60692caa