Update git2 and cargo snapshots

Should fix #1032 and #1029
auto merge of #1045 : alexcrichton/cargo/update-git2, r=alexcrichton

Should fix #1032 and #1029
Merge remote-tracking branch 'upstream/master'