Fix codeblock rendering with HAML when there is a filetype defined.
update style rake task to copy from new sass to old sass folder.  it seems like it was backwards before which makes no sense
Fixed typo in path to jQuery fallback

The `libs` folder was typoed as `lib`
Merge branch 'master' of https://github.com/imathis/octopress
Merge branch 'master' of https://github.com/imathis/octopress
Use a protocol-relative url to load disqus over https or http
removed superfluous parentheses
Merge pull request #1390 from pfista/master

Use a protocol-relative url to load disqus over https or http
Merge pull request #1254 from kAworu/master

make codeblock play nice with HAML
Removed space to fix HAML compatibility on include_code.
Call overridden version of `to_liquid` and remove duplicate code

Make sure to call "overidden" method which keeps us nice and compatible
so we don't need to keep up with whatever Jekyll usually does, and make
sure to include it in our overriden method.

I have had it with these monkey-patching methods in this Monday-to-
Friday language!

Add method `liquid_date_attributes`.

Cleanup the Post and Page overrides to be more similar.
fix minor mis-spelling
Merge pull request #1399 from aleiphoenix/master

fix minor mis-spelling
* consistently convert page and post titles to titlecase if site.titlecase is true;
* properly escaped site title and post/page title in the RSS feeds;
removing border from iframe in jsFiddle plugin
Fix a typo in Readme.markdown
Merge pull request #1405 from AlexVPopov/patch-1

Fix a typo in Readme.markdown
changed sidebar content color so that it does not all change color on hover.
Include timezone offset in new post template for YAML Front-Matter

Closes #1419.