Fix some minor whitespace/gofmt issues
Merge pull request #300 from tianon/whitespace

Fix some minor whitespace/gofmt issues