Don’t require fast-forwards only for git merges

We don’t have a strong prescriptive git workflow, and this setting can actually be harmful in certain situations, such as when managing subtrees.
Capitalize ZSH options
Use properly underscored ZSH options