Remove default merge fast forward value

This worked great for merging in feature branches, but was annoying
having to pass --ff to `git pull`. This also caused annoyances when
running `brew update`, or anything that updates via git.