Add git alias for pull --rebase
Reorganize gitconfig a bit