add a git rebase -i shortcut
various changes
new stuff