Tweak rustfmt config and reformat rust code

[mrjones2014]

For some reason rustfmt isn't grouping imports from the same module together. Fix that and reformat.