Remove rebase pull setting and restore pull aliases
Remove rebase pull setting and restore pull aliases

Rebase on pull by default still weirds me out a little, so I am
restoring the default merge behavior and adding a new alias for pull
rebase to accompany the non-fastforward merge alias that I had already

kburdett/dotfiles,kburdett/dotfiles