Fix travis builds
auto merge of #162 : rust-lang/cargo/fix-travis, r=tinyfix