Remove stray line from merge conflict.
Add the rust-url dependency to Cargo.toml
Simplify the build system.

Remove the `configure` script and the Makefile. This disables optional SSL,
but allows us to switch to Cargo completely. Code generation is now in its own package,
and is called from Cargo through `prebuild.sh`.

The `doc` folder was renamed to `documentation` to avoid deletion when
running `cargo clean`. The examples were moved to the root so they get built when
running `cargo test`.
Update README and examples for build sys changes.

And make the shell script BSD friendly again.
Merge pull request #119 from michaelsproul/build-fix

Simplify the build system and switch to pure Cargo.
Upgrade to rust-url change: the url_ crate was renamed url.
Merge remote-tracking branch 'upstream/master' into rust-url
Upgrade examples/client.rs to rust-url
Merge pull request #113 from SimonSapin/rust-url

Switch to rust-url
Clean gitignore for restructure, ignore Cargo.lock
Merge pull request #120 from michaelsproul/gitignore

Clean gitignore for restructure, ignore Cargo.lock
Documentation examples checks out
Link to documentation in README.rst. Closes #118
Merge pull request #122 from Ogeon/master

Fix documentation tests and add link in README.rst
rust-url breaking change: Url.port is now Option<16> rather than String

https://github.com/servo/rust-url/commit/852d8a90ce6a883c01cb0fd0d99b504de7b18105
Merge pull request #123 from SimonSapin/u16-port

rust-url breaking change: Url.port is now Option<16> rather than String
Derive Hash for Method.
Merge pull request #124 from reem/method-hash

Derive Hash for Method.
Switch the arguments to splitn to account for upstream change.
Removed unusued manifest keys.