Whitespace fixes
Merge pull request #1 from Ventero/whitespace

Whitespace fixes