Rebase instead of merge for git pull
Rebase instead of merge for git pull

When just updating, the user may want to rebase in most cases. Make this
the default in the setup script.

with @nicksellen

yunity/yunity-setup,yunity/yunity-setup