Rustup 20140410

Pull in upstream changes.

This also reinstates the Servo configure file, since upstream added one that is incompatible with ours. Not sure if that's the right thing or if we should create a separate one and change our top-level configure scripts.

r? @metajack