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 pull request #1200 from MrJoy/fix_bad_merge

Fix apparent bad merge.
Merge pull request #1204 from MrJoy/update_clean_and_clobber

Update clean/clobber tasks to get JS assets and...
Merge pull request #1203 from MrJoy/cruft_removal

Octopress no longer listens to .preview-mode, and History.markdown seems...
Merge branch '2.1' into integration