Change kill signal so grandchildren processes end.
Fix disqus to use scheme relative URLs
Merge pull request #1142 from willchan/SchemeRelativeFixes2.1

Fix disqus to use scheme relative URLs
Merge pull request #1140 from sursh/2.1

Change kill signal so grandchildren processes end.
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1
Update Octopress.