Merge upstream

It seems like a few things were changed with rust and upstream was updated. Merging these changes allowed me to build rust-http locally. Locally I had to delete the libtime packages that were installed as part of the rust stdlib `sudo rm /usr/local/lib/rustlib/x86_64-apple-darwin/lib/libtime-4e7c5e5c.*` as it seems that libtime has been split into its own library.

I went down this path when my nickel build started failing, I double checked in my own nickel fork that nickel still builds.