fixed windows bugs
Merge branch 'master' of github.com:rust-builder/rub

Conflicts:
	cargo-rub