Added Disqus comments to pages. Simply add a DISQUS_SHORTNAME setting to your settings.py and comments should appear.
Merge remote-tracking branch 'origin/master'