Making `highlight` behave more like redcarpet

See issue 2510 for details.
Fixing tests.
Merge pull request #2511 from denilsonsa/patch-1