Code review PR

Imports are organized in groups, with blank lines between them. The standard library packages are in the first group. goimports will do this for you. (https://code.google.com/p/go-wiki/wiki/CodeReviewComments#Imports)