Fix deprecated method/function warnings with rustc master
Fix build breakage due to generalized type parameter and object bounds

It is worth noting that cargo was actually creating trait boxes
that contain non-static references, so I couldn't just put 'static
everywhere to appease rustc.
Refresh Cargo.lock

This brings in versions of upstream components with build break fixes
Be compatible with the stdlib for now ('static shell)
Update git2

This updates git2-rs to not use pkg-config on windows.

Closes #472
auto merge of #485 : alexcrichton/cargo/fix-for-rustc-master, r=alexcrichton

Extending #479 to use a `'static` shell instead of a `'a` shell.
Fix a minor typo
auto merge of #487 : Insanity133/cargo/patch-2, r=alexcrichton

This is a fixed version of PR #478 on the gh-pages branch.
Fix relative override paths

Relative paths are now considered relative to the directory containing the
`.cargo/config` file specifying the relative path.

I also merge ConfigValueValue into ConfigValue by moving the Path directly next
to the String that defined it so we can track which strings came from which
paths.

Closes #458