Format tweak
Clean up some whitespace

We had tabs in a couple files somehow, plus trailing spaces.
Merge pull request #2 from gittip/master

latest from upstream