update & tweak magit

--set-upstream on push if there is no upstream branch