Add some more git aliases

- rb, to rebase the branch automatically with the HEAD of the upstream
  branch.
- Edit up to rebase from master before seding to upstream.
Update local bundles.
Refactoring