Clean up whitespace (trailing spaces, spaces that should be tabs).
Merge pull request #14 from markjaquith/clean-up-whitespace

Clean up whitespace (trailing spaces, spaces that should be tabs).