Fix formatting.

* Tabs -> four spaces
* re-indent some long lines
Merge pull request #1 from steveklabnik/master

Fix formatting.