Bring us up to date with upstream

This gets us up to date with msysgit/msysgit and most importantly brings the upstream shellshock fixes into our devel branch (not that we've already shipped cherry-picked fixes for them).