Add aliases for rebasing against master