Add a few extra Magit keybindings
Pull in upstream changes