Default to `git pull --rebase` so we get rid of merge commits

http://mislav.uniqpath.com/2013/02/merge-vs-rebase/