Fix `cargo run` for renamed bin targets
auto merge of #421 : alexcrichton/cargo/issue-418, r=wycats