Re-align aliases in gitconfig
Add 'git up' alias for rebasing against upstream