Use span for highlighting, default hl.encoder (not HTML encoder)
Merge branch 'master' of git@github.com:flaxsearch/hackday