Revert "git merge --no-ff by default, yay!"

This reverts commit bcd9fee610cc785e45b625f1b4e4e612e965e8f5.

This was a horrible idea.