Squashed 'themes/octopress/' changes from 50925a0..29bd9cb

29bd9cb Merge remote-tracking branch 'jakevdp/sharing' into rjw57-blog
2e01f90 Merge pull request #14 from jakevdp/remove-extra-sidebar
8c1cca2 Merge pull request #13 from jakevdp/extra-header
9e068dc Merge pull request #12 from jakevdp/disqus_id
488bdf8 remove extra sidebar include in article
fc63ba0 add disqus_title
fd241d3 add header extra args
e8529a3 add disqus identifier and url

git-subtree-dir: themes/octopress
git-subtree-split: 29bd9cb64dc45896f4e643e2dc265ac4191af149
Merge commit 'a9e9cbb41fd2eb1115990030830579bd3359138f'