Small formatting cleanup

- Imports grouped and ordered in the conventional (goimports) way
- Trailing whitespace removed
Merge pull request #32 from cespare/formatting-cleanup

Small formatting cleanup