Fix Cargo build

Servo's build changes conflict with the Cargo build. This splits them apart.
Merge pull request #30 from metajack/fixup-upstream-cargo-build

Fix Cargo build