Trying to get imports pretty

WIP - Don't merge, @adelevie.