Fix regression in linkify and add MarkupSafe to the vendors
Merge pull request #1827 from gittip/fix-linkify-regression

Fix regression in linkify and add MarkupSafe to the vendors