Whitespace
Merge pull request #936 from richo/cleanup/whitespace

Whitespace
Merge branch 'master' of git://github.com/imathis/octopress into source