Small refactor to make method more concise
Mark output of highlight_words helper as html_safe
Replace use of builder with plain erb because builder is escaping *everything* with rails_xss
Try to be a little nicer by setting the correct content_type for the atom feed
Merge remote-tracking branch 'openaustralia_github/xss_escaping_fixes' into develop