Always use --rebase when pulling from a remote repository

See http://mislav.uniqpath.com/2013/02/merge-vs-rebase/ for an explanation