Update my fork from upstream

I thought there was a single button that did this, but for some reason I'm having to get the updates from upstream into my fork this way. At least that's what I'm trying to do...