added some git config stuff, rebase on pull, etc.