fix cargo installing in ./.cargo, and other misc things#2578

pcwalton merged 4 commits intorust-lang:masterrust-lang/rust:masterfrom

erickt:mastererickt/rust:masterCopy head branch name to clipboard