Update gitconfig

Two new aliases
Use rebase when pulling as default