merge jekyll-2.1.0; disqus