Clean up imports

[calebbourg]

We should take a look at the import sections of each of our files and clean things up so that there's a consistent style.

cargo fmt does not appear to have much of an opinion.

Here is one example of a style guide

[jhodapp]

I might also suggest that we better understand and apply the use of use vs super for our imports.