More import renaming fallout
auto merge of #402 : alexcrichton/cargo/import-rename, r=burningtree