Trying to pull updates from master to my fork

Wow @github needs a button that does this with one click and a confirmation pop-up.