Grab updates from the original git prompt

Mostly I was missing showcolorhints and the progress meter for rebasing, but I went ahead and grabbed all the changes I could see between the scripts.  I noted the original commits I was working from, although I was combining several at a time where appropriate.