Fix Cargo build

Servo's build changes conflict with the Cargo build. This splits them apart.
Does anything else need to change (in a higher level project) to reference configure.servo instead of configure?