Use rebase by default when pulling
Change pushing behavior to simple instead of matching