grit patches for ruby2

eventually we'll move to grugged or rugged or whatever the heck the
hipsters are passing off as the next-big-git-access gem.  But it doesn't
have blame support yet, so we'll schlep along with grit for the moment.