Re-attempt to fix the nightly windows installer
auto merge of #198 : rust-lang/cargo/another-nightly-fix, r=wycats

I actually verified it this time to make sure it passes!