Switched code style to a more usual Ruby style

* Two spaces indentation
* Got rid of two semicolons
* Added a blank line before the return value
Merge pull request #1098 from gkarekinian/style

Switched code style to a more usual Ruby style
Merge branch '2.1' of git://github.com/imathis/octopress into testing-2.1