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.
Octopress no longer listens to .preview-mode, and History.markdown seems to be supplanted by CHANGELOG.markdown.
Update clean/clobber tasks to get JS assets and be more informative about what's going on.
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.
Using File.join more consistently.
Bring over changes from History.markdown...
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...
Reorganized modular javascript to make installation and configuration easier. Removed swf fallback video js (making it an external plugin).
Fixed expandable embeded youtube and video video support
Javascript modules can live in subdirectories
Corrected capitalization of !important to satisfy validators, whatever they might be.
Merge pull request #1244 from crazysim/correct-capitalization

Corrected capitalization of !important
Fixed Typo