tags plugin: URI.escape fix

Delete quick fix for mojombo/jekyll#1211 and add quick fix for
mojombo/jekyll#1568.