Fix codeblock rendering with HAML when there is a filetype defined.
Merge branch 'master' of https://github.com/imathis/octopress
Merge branch 'master' of https://github.com/imathis/octopress
Merge pull request #1254 from kAworu/master

make codeblock play nice with HAML
Removed space to fix HAML compatibility on include_code.
Merge branch 'master' of git://github.com/imathis/octopress
fix minor mis-spelling
Merge pull request #1399 from aleiphoenix/master

fix minor mis-spelling
Merge branch 'master' of git://github.com/imathis/octopress