Namespace Disqus config vars.
Fix apparent bad merge.

(Note that the include block appears earlier in the file, and the explanation of setting pygments to true disappeared at some point...)
Clean up spurious trailing whitespace, and extra/missing newlines at EOF.
Make RSync deployments a bit safer by making deletion of defunct files happen after everything else is updated.

This prevents a race condition where someone may get an old version of a page, and have dependent assets not exist.
Merge pull request #1205 from MrJoy/safer_rsync

Make RSync deployments a bit safer by making deletion of defunct files h...
Merge pull request #1202 from MrJoy/whitespace_cleanup

Clean up spurious trailing whitespace, and extra/missing newlines at EOF...
Merge pull request #1199 from MrJoy/disqus_namespacing

Namespace Disqus config vars.
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1
Update Octopress, with my site.yml also
Merge pull request #1200 from MrJoy/fix_bad_merge

Fix apparent bad merge.
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1
Update Octopress.