Added rebase aliases
Updated gitignore